@sap/cds-dk 6.4.0 → 6.5.0

package/lib/bind/kubernetesCredentialsProvider.js

@@ -1,139 +1,52 @@
-const cp = require('child_process');
-const os = require('os');
-const util = require('util');
-const yaml = require("@sap/cds-foss")("yaml");
-const { exec } = require('../util/exec');
-const https = require('https')
-
-const axios = require('axios');
-const { URL } = require('url');
-
-const execFile = util.promisify(cp.execFile);
-const IS_WIN = os.platform() === 'win32';
+const KubernetesApiAccessor = require('./KubernetesApiAccessor');
 
 class KubernetesCredentialsProvider {
-
-    constructor() {
-        this.logger = console;
-    }
-
-    setLogger(logger) {
-        this.logger = logger;
-    }
-
-    async _kubectlRead(...args) {
-        this.logger.debug(`_kubectlRead: kubectl ${args.join(" ")}`);
-
-        const result = await execFile("kubectl", args, {
-            shell: IS_WIN,
-            stdio: ['inherit', 'pipe', 'inherit'],
-        });
-
-        return result.stdout.toString().trim();
-    }
-
-
-    async _kubectlConfig() {
-        const configString = await this._kubectlRead('config', 'view', '--raw');
-        const config = yaml.parse(configString);
-
-        const currentContextName = config["current-context"];
-        if (!currentContextName) throw new Error(`No current context in kubectl config.`);
-        const currentContextEntry = config.contexts && config.contexts.find( entry => entry.name === currentContextName && entry.context && entry.context.cluster && entry.context.user );
-        if (!currentContextEntry) throw new Error(`Current context not found in kubectl config.`);
-        const currentContext = currentContextEntry.context;
-        const clusterEntry = config.clusters && config.clusters.find( entry => entry.name === currentContext.cluster && entry.cluster && entry.cluster.server );
-        if (!currentContextEntry) throw new Error(`Cluster ${currentContext.cluster} not found in kubectl config.`);
-        const cluster = clusterEntry.cluster;
-        const userEntry = config.users && config.users.find( entry => entry.name === currentContext.user && entry.user);
-        if (!userEntry) throw new Error(`User ${currentContext.user} not found in kubectl config.`);
-        const user = userEntry.user;
-        let token;
-        if (user.token) {
-            token = user.token;
-        } else if (user.exec) {
-            const resultJson = await exec({result: 'stdout'}, user.exec.command, ...user.exec.args);
-            const result = JSON.parse(resultJson);
-            token = result.status && result.status.token;
-        } else {
-            throwError `Unsupported authentication method for kubectl context ${currentContextName}`;
-        }
-
-        if (!token) throwError `kubectl authentication failed for kubectl context ${currentContextName}`;
-
-        return {
-            url: cluster.server,
-            httpsAgent: cluster['certificate-authority-data'] && new https.Agent({
-                ca: Buffer.from(cluster['certificate-authority-data'], 'base64').toString()
-            }),
-            namespace: currentContext.namespace || 'default',
-            token
-        }
-    }
-
     async init() {
-        this.config = await this._kubectlConfig();
+        this.api = new KubernetesApiAccessor();
     }
 
-    async _req(urlPath) {
-
-        const url = new URL(urlPath, this.config.url);
-        this.logger.debug(`_req: ${url.toString()}`);
-
-        const result = await axios.get(url.toString(), {
-            validateStatus: status => status === 200 || status === 404,
-            headers: {
-                authorization: `Bearer ${this.config.token}`
-            },
-            httpsAgent: this.config.httpsAgent
-        });
-
-        if (result.status === 200) {
-            return result.data;
-        } else {
-            return null
-        }
-    }
-
-
     async resolve(name, binding) {
         if (!this.initPromise) {
             this.initPromise = this.init();
         }
         await this.initPromise;
 
-        let {cluster, namespace, name: bindingName, secret } = binding;
+
+        const {context, namespace, cluster} = await this.api.context({cluster: binding.cluster, namespace: binding.namespace});
+        let {name: bindingName, secret} = binding;
+
         let instance;
         let secretOrBindingResource = 'Secret';
 
-        if (!namespace) namespace = this.config.namespace;
-        if (cluster && cluster !== this.config.url) throw new Error(`Current Kubernetes cluster "${this.config.url}" different than Kubernetes cluster "${cluster}" for service binding "${name}".`);
-
         if (bindingName) {
-            const bindingResource = await this._req(`/apis/services.cloud.sap.com/v1/namespaces/${encodeURIComponent(namespace)}/servicebindings/${encodeURIComponent(bindingName)}`);
+            const bindingResource = await this.api.get({context, namespace, kind: 'servicebindings', name: bindingName});
             if (bindingResource === null) {
                 // Fallback to secret instead of service binding;
                 secret = bindingName;
                 bindingName = undefined;
                 secretOrBindingResource = 'Service Binding or Secret';
             } else {
-                secret = bindingResource.spec.secretName || throwError();
-                instance = bindingResource.spec.serviceInstanceName || throwError();
+                const { spec } = bindingResource
+                if (!spec.secretName || !spec.serviceInstanceName) {
+                    throw new Error('Internal error')
+                }
+                secret = spec.secretName;
+                instance = spec.serviceInstanceName;
             }
         }
 
-        const secretResource = await this._req(`/api/v1/namespaces/${encodeURIComponent(namespace)}/secrets/${encodeURIComponent(secret)}`);
-        if (secretResource === null) throwError(`${secretOrBindingResource} '${secret}' not found.`);
+        const secretResource = await this.api.get({context, namespace, kind: 'secrets', name: secret});
+        if (secretResource === null) throw new Error(`${secretOrBindingResource} '${secret}' not found.`);
 
-        const serviceBinding = readBinding(name, secretResource);
+        const serviceBinding = this._readBinding(name, secretResource);
         const { credentials } = serviceBinding;
-        const vcap = {...serviceBinding, credentials: undefined}
+        const vcap = { ...serviceBinding, credentials: undefined }
 
         const resolvedBinding = {
             binding: {
                 type: "k8s",
                 name: bindingName,
-                cluster: this.config.url,
+                cluster,
                 instance,
                 namespace,
                 secret: secret,
@@ -146,36 +59,25 @@ class KubernetesCredentialsProvider {
         return resolvedBinding;
     }
 
-}
+    _readBinding(name, secret) {
+        const { data } = secret;
+        const properties = {};
+        for (const name in data) {
+            const value = Buffer.from(data[name], "base64").toString()
+            properties[name] = value;
+        }
 
-function readBinding(name, secret) {
-    const { data } = secret;
-    const properties = {};
-    for (const name in data) {
-        const value = Buffer.from(data[name], "base64").toString()
-        properties[name] = value;
-    }
+        let parseBinding
+        try {
+            // eslint-disable-next-line
+            parseBinding = require('@sap/cds/lib/env/serviceBindings').parseBinding;
+        } catch (error) {
+            //
+        }
+        if (!parseBinding) throw new Error(`Please update your @sap/cds version for Kubernetes support`)
 
-    let parseBinding
-    try {
-        // eslint-disable-next-line
-        parseBinding = require('@sap/cds/lib/env/serviceBindings').parseBinding;
-    } catch (error) {
-        //
+        return parseBinding('/', name, properties);
     }
-    if (!parseBinding) throwError `Please update your @sap/cds version for Kubernetes support`
-
-    return parseBinding('/', name, properties);
-}
-
-
-/**
- *
- * @param {string} msg
- * @returns {never}
- */
-function throwError(msg = 'Internal Error') {
-    throw new Error(msg);
 }
 
 module.exports = new KubernetesCredentialsProvider();

package/lib/bind/userCdsrcJsonStorageProvider.js

@@ -2,8 +2,11 @@ const os = require('os');
 const path = require('path');
 const readline = require('readline');
 
+const DEBUG = /\b(y|all|cli)\b/.test(process.env.DEBUG)  && console.debug
+
 const fs = require('fs').promises;
 const { highlight } = require('../util/term');
+const { logger } = require('./bindingUtil')
 
 const commandUtil = require('../init/util/commandUtil');
 
@@ -11,7 +14,6 @@ const CDSRC_FILENAME = '.cdsrc-private.json';
 const GIT_IGNORE_FILE = '.gitignore';
 
 class UserCdsrcJsonStorageProvider {
-
     async askBooleanQuestion(question) {
         const rl = readline.createInterface({
             input: process.stdin,
@@ -31,23 +33,23 @@ class UserCdsrcJsonStorageProvider {
         });
     }
 
-    async ensureFileIsGitignored(file, logger = console) {
+    async ensureFileIsGitignored(file) {
         try {
             await commandUtil.spawnCommand('git', ['check-ignore', '-n', '-v', file], {}, undefined, true);
             return; // file is git ignored
         } catch (err) {
             if (err.code === 'ENOENT') {   // git command not found
-                logger.debug('git command not found');
+                DEBUG && DEBUG('git command not found');
                 return;
             }
 
             if (!err.stdLog.match(/::/)) {   // included or not a git repo
-                logger.debug(err);
+                DEBUG && DEBUG(err);
                 return;
             }
         }
 
-        logger.info(`adding entry '${file}' to ${GIT_IGNORE_FILE}.`);
+        logger.log(`adding entry '${file}' to ${GIT_IGNORE_FILE}.`);
         let gitignore = await this.readFileSafely(GIT_IGNORE_FILE);
         gitignore = gitignore + `
 # added by cds bind
@@ -68,7 +70,7 @@ ${file}
         let jsonPath = options['output-file'] || CDSRC_FILENAME;
 
         if (jsonPath === CDSRC_FILENAME) {
-            await this.ensureFileIsGitignored(CDSRC_FILENAME, options.logger);
+            await this.ensureFileIsGitignored(CDSRC_FILENAME);
         }
 
         jsonPath = jsonPath.replace(/~/g, os.homedir());
@@ -77,14 +79,6 @@ ${file}
             jsonPath = path.join(jsonPath, '.cdsrc.json');
         }
 
-        // if (options['save-credentials'] && services.find(service => service.credentials) && process.stdin.isTTY) {
-        //     const answer = await this.askBooleanQuestion(warn(`IF YOU CONTINUE, SENSITIVE DATA WILL BE WRITTEN TO AN UNENCRYPTED FILE [${jsonPath}]! Do you want to continue [y/N] ?`));
-        //     if (!answer) {
-        //         options.logger.info(`aborting cds bind; not writing any sensitive data to file [${jsonPath}]`);
-        //         return;
-        //     }
-        // }
-
         const jsonObject = await this.readJsonSafely(jsonPath);
         let cdsRoot;
         if (path.basename(jsonPath) === 'package.json') {
@@ -110,14 +104,14 @@ ${file}
             const { name, kind, binding, credentials } = service;
             const requireService = section[name] = section[name] || {};
 
-            Object.assign(requireService, { binding: {...binding, vcap: undefined}, credentials, kind, vcap: { name } });
+            Object.assign(requireService, { binding: { ...binding, vcap: undefined }, credentials, kind, vcap: { name } });
         }
 
-        await this.writeJsonFile(jsonPath, jsonObject, options.logger);
+        await this.writeJsonFile(jsonPath, jsonObject);
         if (options.profile) {
-            options.logger.info(`Saving bindings to ${highlight(jsonPath)} in profile ${highlight(options.profile)}`);
+            logger.log(`Saving bindings to ${highlight(jsonPath)} in profile ${highlight(options.profile)}`);
         } else {
-            options.logger.info(`Saving bindings to ${highlight(jsonPath)}`);
+            logger.log(`Saving bindings to ${highlight(jsonPath)}`);
         }
     }
 

package/lib/client/params.js

@@ -153,7 +153,7 @@ class Param {
 // CONCRETE PARAMS
 
 /**
- * The known params and their default values, restricted to those needed by the app as a whole.
+ * The known params and their default values, restricted to those needed by the MTXS Client as a whole.
  */
 class BasicParams {
     constructor() {
@@ -211,7 +211,7 @@ class AllParams extends BasicParams {
         this.sync                   = new Param('sync',                   false);
 
         // `login` PARAMS
-        this.skipToken              = new Param('skipToken',              false);
+        this.skipToken              = new Param('skipToken',              false, { internal: true });
 
         // `logout` PARAMS
         this.deleteSettings         = new Param('deleteSettings',         false);

package/lib/client/push.js

@@ -1,4 +1,4 @@
-const cds = require ('../cds'), { local } = cds.utils
+const cds = require ('../cds'), { local } = cds.utils;
 const fs = require('fs');
 const { join } = require('path');
 const axios = require('axios');
@@ -10,23 +10,28 @@ const { schemaRegex } = require('./helper/url_helper');
 
 module.exports = class Push extends BaseCommand {
 
-    static async run(paramValues, pushOptions) {
+    static async run(paramValues, pushOptions = {}) {
         const params = await login(paramValues);
+        const projectFolder = params.get('projectFolder');
+        const extensionName = this.getExtensionName(projectFolder);
 
-        const { src, content } = await this.readSource(params, pushOptions);
+        if (!('extArchive' in pushOptions)) {
+            console.log(`Building project`);
+            await cds.build({ project: projectFolder });
+        }
 
-        const extensionName = this.getExtensionName(params.get('projectFolder'));
+        const { src, content } = await this.readSource(params, pushOptions);
         const url = params.get('appUrl');
         const subdomain = params.get('subdomain');
         const target = Object.assign({ url }, subdomain && { subdomain });
-        console.log(`\nPushing extension '${extensionName}' from`, { src }, 'to', target);
 
+        console.log(`\nPushing extension '${extensionName}' from`, { src }, 'to', target);
         await this.pushTgz(params, content, extensionName);
         console.log ('Activation succeeded.\n')
     }
 
     static async readSource(params, pushOptions) {
-        let src = pushOptions?.extArchive ?? join(params.get('projectFolder'), 'gen', 'extension.tgz');
+        let src = pushOptions?.extArchive ?? join(params.get('projectFolder'), 'gen/extension.tgz');
         let content;
         if (fs.existsSync(src)) {
             content = fs.readFileSync(src, { encoding: 'base64' });

package/lib/client/settings_manager.js

@@ -184,6 +184,7 @@ class SettingsManager {
         if (params.get('tokenStorage') === 'plain') {
             await this._saveAuthToFile(params, params.toValueMap(Persistence.auth));
         } else if (params.get('tokenStorage') === 'keyring') {
+            await this.checkKeytar(params);
             await this._saveAuthToKeyring(params, params.toValueMap(Persistence.auth));
         } else {
             console.log('Note: the authentication token is not saved by default. To save the token for later commands, please run `cds login`.');
@@ -281,7 +282,7 @@ class SettingsManager {
         }
     }
 
-    static async checkKeytar(params, logout) {
+    static async checkKeytar(params, logout = false) {
         if (params.get('skipToken')) {
             return;
         }

package/lib/client/subscription.js

@@ -4,6 +4,7 @@ const { CliError } = require('./helper/errors');
 const { ParamCollection } = require('./params');
 const AuthManager = require('./auth_manager');
 const { capitalize } = require('./helper/string_helper');
+const { debug } = require('./helper/logging');
 
 module.exports = class ToggleSubscription extends BaseCommand {
 
@@ -16,6 +17,7 @@ module.exports = class ToggleSubscription extends BaseCommand {
         this.command = prefix + 'subscribe';
         this.gerund = prefix + 'subscribing';
         this.noun = prefix + 'subscription';
+        this.preposition = on ? 'to' : 'from';
     }
 
     async run(paramValues, { tenant, local } = {}) {
@@ -37,8 +39,9 @@ module.exports = class ToggleSubscription extends BaseCommand {
     }
 
     async runClientOnly(params, tenant) {
-        console.log(capitalize(this.gerund), { tenant }, 'from', { url: params.get('appUrl') });
+        console.log(capitalize(this.gerund), { tenant }, this.preposition, { url: params.get('appUrl') });
         const url = `${params.get('appUrl')}/-/cds/deployment/${this.command}`;
+        debug(`Sending request to ${url}`);
         try {
             await require('axios').post(url, { tenant }, params.get('reqAuth'));
         } catch (error) {

package/lib/import/odata/v2parser.js

@@ -333,7 +333,6 @@ function _parseDocumentationTag(documentedContent) {
 function _extractComplexType(complexType, parserContext) {
 	let complexTypeKey = "";
 	let baseType = "";
-	let properties;
 	let namespaceAttributes = {};
 	Object.keys(complexType).forEach((key) => {
 		if (key === "_attributes") {
@@ -344,7 +343,7 @@ function _extractComplexType(complexType, parserContext) {
 				complexType.open = true;
 			}
 		} else if (key === "Property") {
-			properties = complexType.Property;
+			// properties = complexType.Property;
 		} else if (key === "Documentation") {
 			parserContext.allComplexTypeDocs[complexTypeKey] = _parseDocumentationTag(complexType.Documentation);
 		}
@@ -381,6 +380,7 @@ function _getServiceEntityProperty(
 	documentation,
 	allowedNamespaceAttributes = -1,
 	nullable,
+	collectionKind,
 	parserContext
 ) {
 	let isCollection = -1;
@@ -458,18 +458,18 @@ function _getServiceEntityProperty(
 	if (isKey) {
 		propertyJson = propertyJson + '"key": true,\n';
 	}
-	if (isCollection === 1) {
+	if (isCollection === 1 || collectionKind === 1) {
 		//if annotations to be added
 		if (edmxncdsdatatype[dataType + "_a"] && cdsDataType != "cds.Date") {
-			if (dataType === 'Edm.Stream') 
+			if (dataType === 'Edm.Stream')
 				propertyJson = propertyJson + '"@Core.MediaType": "application/octet-stream",\n';
-			else 
+			else
 				propertyJson = propertyJson + '"@odata.Type": "' + dataType + '",\n';
 		}
 
 		//adding precision in case of DateTime datatypes
 		if ((dataType === "Edm.DateTimeOffset" || dataType === "Edm.DateTime") && cdsDataType != "cds.Date") {
-			if (precision && precision > 0){
+			if (precision && precision > 0) {
 				propertyJson = propertyJson + '"@odata.Precision": ' + precision + ',\n';
 			}
 		}
@@ -559,6 +559,10 @@ function _getServiceComplexType(complexTypeKey, complexType, parserContext, isOp
 				complexTypeProperty = complexType[i]._attributes;
 				if (complexType[i].Documentation)
 					complexTypeProperty.doc = _parseDocumentationTag(complexType[i].Documentation);
+					complexType.CollectionKind = 0;
+					if (complexType[i]._attributes.CollectionKind === "Bag" || complexType[i]._attributes.CollectionKind === "List") {
+						complexType.CollectionKind = 1;
+					}
 				let namespaceAttributes = namespaceAttributeFilter(complexTypeProperty, parserContext);
 				const complexTypePropertyNamespace = namespaceAttributes.length ? namespaceAttributes : -1
 
@@ -574,6 +578,7 @@ function _getServiceComplexType(complexTypeKey, complexType, parserContext, isOp
 						complexTypeProperty.doc,
 						complexTypePropertyNamespace,
 						complexTypeProperty.Nullable,
+						complexType.CollectionKind,
 						parserContext
 					);
 				complexTypeCSN = complexTypeCSN + complexProperty;
@@ -589,6 +594,10 @@ function _getServiceComplexType(complexTypeKey, complexType, parserContext, isOp
 			if (complexType.Documentation)
 				complexTypeProperty.doc = _parseDocumentationTag(complexType.Documentation);
 
+			complexType.CollectionKind = 0;
+			if (complexType._attributes.CollectionKind === "Bag" || complexTypeProperty.CollectionKind === "List") {
+				complexTypeProperty.CollectionKind = 1;
+			}
 			let namespaceAttributes = namespaceAttributeFilter(complexTypeProperty, parserContext);
 			const complexTypePropertyNamespace = namespaceAttributes.length ? namespaceAttributes : -1;
 
@@ -604,6 +613,7 @@ function _getServiceComplexType(complexTypeKey, complexType, parserContext, isOp
 					complexTypeProperty.doc,
 					complexTypePropertyNamespace,
 					complexTypeProperty.Nullable,
+					complexTypeProperty.CollectionKind,
 					parserContext
 				);
 		}
@@ -663,6 +673,7 @@ function _parseParameter(parameter, parserContext) {
 			doc,
 			parameterNamespaceAttributes,
 			parameter["_attributes"].Nullable,
+			parameter["_attributes"].CollectionKind,
 			parserContext
 		);
 	return csn;
@@ -739,7 +750,7 @@ function _getFunctionImport(functionImport, isBounded, entityKeysList, parserCon
 	}
 	if (functionImport[2] !== -1) {
 		let returnCsn = _getServiceEntityProperty(noValue, functionImport[2], noValue, noValue, noValue, 
-			noValue, noValue, noValue, -1, noValue, parserContext);
+			noValue, noValue, noValue, -1, noValue, noValue, parserContext);
 		if (returnCsn != "") {
 			csn = csn + ", \n";
 			csn = csn + '"returns": { \n';
@@ -812,14 +823,16 @@ function _parseEntityKeys(keys) {
 function _getPropertyAttributes(propAttributes, parserContext) {
 	let propOthers = [];
 
-	let namespaceAttributes = namespaceAttributeFilter(propAttributes, parserContext)
+	let namespaceAttributes = namespaceAttributeFilter(propAttributes, parserContext);
 
 	propOthers.push(propAttributes.Type);
+
 	if (propAttributes.MaxLength) {
 		propOthers.push(propAttributes.MaxLength);
 	} else {
 		propOthers.push(-1);
 	}
+
 	if (propAttributes.Precision) {
 		propOthers.push(propAttributes.Precision);
 	} else {
@@ -856,6 +869,13 @@ function _getPropertyAttributes(propAttributes, parserContext) {
 		propOthers.push("true");
 	}
 
+	if (propAttributes.CollectionKind === 'List' || propAttributes.CollectionKind === 'Bag') {
+		propOthers.push(1);
+	}
+	else {
+		propOthers.push(-1);
+	}
+
 	return propOthers;
 }
 
@@ -916,6 +936,7 @@ function _generateCSNEntityKeys(entityKeysList, entityPropertiesMap, parserConte
 		if (propAttributes[7] == "true") {
 			console.log(warn("Expected key element to be not nullable"));
 		}
+
 		let keyCsn =
 			_getServiceEntityProperty(
 				entityKeysList[i],
@@ -928,6 +949,7 @@ function _generateCSNEntityKeys(entityKeysList, entityPropertiesMap, parserConte
 				propAttributes[5],
 				propAttributes[6],
 				"false",
+				propAttributes[8],
 				parserContext
 			);
 		csnEntity = csnEntity + keyCsn;
@@ -958,6 +980,7 @@ function _generateCSNEntityProperties(entityKeysList, entityPropertiesMap, parse
 		// Include Property which are not part of keys
 		if (entityKeysList.indexOf(property) === -1) {
 			propAttributes = entityPropertiesMap[property];
+
 			let propertyString =
 				_getServiceEntityProperty(
 					property,
@@ -970,6 +993,7 @@ function _generateCSNEntityProperties(entityKeysList, entityPropertiesMap, parse
 					propAttributes[5],
 					propAttributes[6],
 					propAttributes[7],
+					propAttributes[8],
 					parserContext
 				);
 			csnEntity = csnEntity + propertyString;

package/lib/import/odata/v4parser.js

@@ -112,7 +112,12 @@ function _isValidJSON(jsonObj, parserContext) {
 function _hasEntityContainer(jsonObj, parserContext) {
     let jsonObjEntityContainer = jsonObj.$EntityContainer;
     try {
-        if (jsonObjEntityContainer) [parserContext.namespace, parserContext.jsonEntityContainerName] = jsonObjEntityContainer.split('.');
+        if (jsonObjEntityContainer) {
+            // scenario: Schema Namespace="A.B.C.D" & jsonObjEntityContainer is "A.B.C.D.EntityContainerName"
+            let lastIndex = jsonObjEntityContainer.lastIndexOf('.');
+            parserContext.namespace = jsonObjEntityContainer.substring(0, lastIndex);
+            parserContext.jsonEntityContainerName = jsonObjEntityContainer.substring(lastIndex + 1);
+        }
         if (jsonObj[parserContext.namespace][parserContext.jsonEntityContainerName] &&
             jsonObj[parserContext.namespace][parserContext.jsonEntityContainerName] instanceof Object
         ) {
@@ -1212,6 +1217,7 @@ function _generateDocumentation(edmxAsJson, schemaData, cdsDefs, parserContext)
     let vocabAlias = [];
     let vocab = [];
     let vocabNamespce = [];
+    let controlFieldFlag = 0;
     if (schemaData[0].$Annotations) {
         if (edmxAsJson.$Reference) {
             Object.entries(edmxAsJson.$Reference).forEach(a => {
@@ -1232,8 +1238,9 @@ function _generateDocumentation(edmxAsJson, schemaData, cdsDefs, parserContext)
                     if (annotation[1].hasOwnProperty('@Core.Description')) {
                         no_of_terms = true;
                     }
-                    if (annotation[1].hasOwnProperty('@Common.FieldControl')) {
-                        annotation[1]["@Common.FieldControl"] = { "#": annotation[1]["@Common.FieldControl"] }
+                    if (annotation[1].hasOwnProperty('@Common.FieldControl') && controlFieldFlag === 0) {
+                        annotation[1]["@Common.FieldControl"] = { "#": annotation[1]["@Common.FieldControl"]}
+                        controlFieldFlag = 1;
                     }
                     if (annotation[1].hasOwnProperty('@Common.IsUpperCase')) {
                         annotation[1]["@Common.IsUpperCase"] = true;
@@ -1241,6 +1248,7 @@ function _generateDocumentation(edmxAsJson, schemaData, cdsDefs, parserContext)
                     _checkAnnotationTarget(annotation, cdsDefs, anno[0], no_of_terms, vocab, parserContext);
                 }
             });
+            controlFieldFlag = 0;
         });
     }
 }

package/lib/init/constants.js

@@ -1,6 +1,6 @@
 const os = require('os');
 
-const MAVEN_ARCHETYPE_VERSION = '1.30.0';
+const MAVEN_ARCHETYPE_VERSION = '1.30.1';
 
 const constants = {
     IS_WIN: (os.platform() === 'win32'),

package/lib/init/index.js

@@ -1,7 +1,6 @@
 const path = require('path');
 
 const term = require('../util/term');
-const Spinner = require('./util/spinner');
 
 const { OPTIONS_PRIORITY, COMMAND_ADD, COMMAND_INIT,
     // eslint-disable-next-line no-unused-vars
@@ -11,7 +10,7 @@ const { OPTIONS_PRIORITY, COMMAND_ADD, COMMAND_INIT,
 
 const cds = require('../cds'), { exists, readdir } = cds.utils
 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
 
 module.exports = class CDSGenerator {
     constructor() {
@@ -212,15 +211,8 @@ module.exports = class CDSGenerator {
 
         for (const template of this.templateList) {
             const msg = `Adding feature '${template.name}'...`;
-            if (DEBUG) {
-                LOG.info(msg);
-                await template.run();
-            } else {
-                const spinner = new Spinner();
-                await spinner.run(msg, async () => { // NOSONAR
-                    return template.run();
-                });
-            }
+            LOG.info(msg);
+            await template.run();
         }
 
         LOG.info(`Done adding features`);

package/lib/init/template/approuter/files/approuter-configmap.yaml

@@ -1,5 +1,8 @@
 # Please do not modify this file. This file may be overwritten.
 
+{{- $defaultParameters :=  dict "forwardAuthToken" true }}
+{{- $ := dict "root" . "defaultParameters" $defaultParameters }}
+
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -7,4 +10,4 @@ metadata:
   namespace: "{{ .Release.Namespace }}"
 data:
   destinations: >
-    {{ include "cap.approuterDestinations" . }}
+    {{ include "cap.backendDestinations" $ }}