@sap/cds-dk 6.3.2 → 6.4.1

package/lib/import/odata/v4parser.js

@@ -4,7 +4,6 @@
  */
 
 "use strict";
-
 let messages = require("../message").getMessages();
 let common = require("../common");
 let versionInfo = require("../../../package.json").version;
@@ -71,6 +70,8 @@ function _initialize(parserContext) {
     parserContext.unboundedFunctions = {};
     parserContext.boundedFunctions = {};
     parserContext.entityTypes = [];
+    parserContext.entityTypeOpenEntries = [];
+    parserContext.complexTypeOpenEntries = [];
     parserContext.namespace = "";
     parserContext.complexTypes = {};
     parserContext.enumTypes = {};
@@ -100,11 +101,7 @@ function _isValidDataType(propertyType) {
 }
 
 function _isValidJSON(jsonObj, parserContext) {
-    let tempNamespace = jsonObj.$EntityContainer;
-    parserContext.namespace = tempNamespace.substring(0, tempNamespace.lastIndexOf('.'));
-    parserContext.jsonEntityContainerName = tempNamespace.substring(tempNamespace.lastIndexOf('.') + 1);
-
-    if (jsonObj.$Version && jsonObj.$EntityContainer && jsonObj[parserContext.namespace]) {
+    if (jsonObj.$Version && _hasEntityContainer(jsonObj, parserContext) && jsonObj[parserContext.namespace]) {
         return true;
     }
     else {
@@ -113,22 +110,24 @@ function _isValidJSON(jsonObj, parserContext) {
 }
 
 function _hasEntityContainer(jsonObj, parserContext) {
-    if (jsonObj[parserContext.namespace][parserContext.jsonEntityContainerName] &&
-        jsonObj[parserContext.namespace][parserContext.jsonEntityContainerName] instanceof Object
-    ) {
-        return true;
-    } else {
+    let jsonObjEntityContainer = jsonObj.$EntityContainer;
+    try {
+        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
+        ) {
+            return true;
+        } 
+    } catch (err) {
         throw new Error(messages.MISSING_ENTITY_CONTAINER);
     }
 }
 
-function _validateJSON(jsonObj, parserContext) {
-    return (
-        _isValidJSON(jsonObj, parserContext) &&
-        _hasEntityContainer(jsonObj, parserContext)
-    );
-}
-
 function _includeExternalNamespaceAnnotation(source, target) {
     Object.entries(source).forEach(element => {
         if (element[0].startsWith('@')) {
@@ -137,6 +136,11 @@ function _includeExternalNamespaceAnnotation(source, target) {
     });
 }
 
+function _addNotNull(property, isCollection) {
+    if (isCollection) property.items["notNull"] = true;
+    else property["notNull"] = true; 
+}
+
 function _typeWithCollections(property, type, isCollection) {
     if (isCollection === true) {
         let typeKeys = Object.keys(type);
@@ -166,7 +170,9 @@ function generatePropertyCsn(propertyType, isPrimaryKey) {
         typeProperties["notNull"] = true;
     }
     else {
-        typeProperties["notNull"] = propertyType.$Nullable ? false : true;
+        if ((propertyType.$Nullable !== true) && (propertyType.$Kind !== 'TypeDefinition')) {
+            typeProperties["notNull"] = true;
+        }
     }
     _includeExternalNamespaceAnnotation(propertyType, property);
     // conditions have to be made
@@ -225,16 +231,18 @@ function _generateComplexTypePropertyCsn(propertyType) {
     let property = {};
     let type = { type: propertyType.$Type }
     _typeWithCollections(property, type, propertyType.$Collection);
+    if (!propertyType.$Nullable) _addNotNull(property, propertyType.$Collection);
 
     return property;
 }
 
 function _generateTypeDefinitionPropertyCsn(propertyType) {
     let property = {};
-    let type = { type: propertyType.$Type }
+    let type = { type: propertyType.$Type };
 
     _includeExternalNamespaceAnnotation(propertyType, property);
     _typeWithCollections(property, type, propertyType.$Collection);
+    if (!propertyType.$Nullable) _addNotNull(property, propertyType.$Collection);
 
     return property;
 }
@@ -251,6 +259,11 @@ function _parseAssociationProperty(foreignReference, associationNode, mockServer
     // annotation for ON condition
     associationProperty["@cds.ambiguous"] = 'missing on condition?';
     // associationProperty.target = associationNode.$Type;
+
+    //Code for NavigationProperty for notNull
+    /*if(associationProperty.$Nullable != true){
+        associationProperty["notNull"] = true;
+    }*/
     if (mockServerUc && parserContext.entitySetToEntityTypeMap && parserContext.entitySetToEntityTypeMap.get(associationNode.$Type)) {
         if (parserContext.entitySetToEntityTypeMap.get(associationNode.$Type).length > 1) {
             for (let j = 0; j < parserContext.entitySetToEntityTypeMap.get(associationNode.$Type).length; j++) {
@@ -333,6 +346,7 @@ function _generateCSNForEntityType(ignorePersistenceSkip, mockServerUc, parserCo
         let key = Object.keys(element)[0];
         let baseType = element[key].$BaseType;
         let isAbstract = element[key].$Abstract;
+        let isOpenType = element[key].$OpenType;
         if (key) {
             entityCsn[key] = {};
             entityCsn[key].kind = 'entity';
@@ -355,9 +369,10 @@ function _generateCSNForEntityType(ignorePersistenceSkip, mockServerUc, parserCo
                     baseType = _getBaseTypeEntityName(baseType, parserContext);
                 }
                 entityCsn[key].includes.push(baseType);
+                if (!parserContext.entityTypeOpenEntries.includes(baseType)) parserContext.entityTypeOpenEntries.push(baseType);
             }
-            if (isAbstract) {
-                entityCsn[key].abstract = isAbstract;
+            if ((isAbstract || isOpenType) && !parserContext.entityTypeOpenEntries.includes(key)) {
+                parserContext.entityTypeOpenEntries.push(key);
             }
             entityCsn[key].elements = {};
             keySet = [];
@@ -408,6 +423,12 @@ function _generateCSNForEntityType(ignorePersistenceSkip, mockServerUc, parserCo
             }
         }
     });
+
+    // add @open annotations
+    parserContext.entityTypeOpenEntries.forEach(key => {
+        if (entityCsn[key]) entityCsn[key]['@open'] = true;
+    });
+
     return entityCsn;
 }
 
@@ -579,6 +600,26 @@ function _generateBounded(schemaData, flag, parserContext) {
     return bFunction;
 }
 
+function _captureOptionalParameter(annotation, path) {
+    let param = annotation[0].split('/');
+    let defaultvalue = annotation[1]["@Core.OptionalParameter"]["DefaultValue"];
+    if (path.params === undefined) {
+        _addDefaultValueObject(path, defaultvalue);
+    }
+    else {
+        _addDefaultValueObject(path.params[param[1]], defaultvalue);
+    }
+    return path;
+}
+
+function _addDefaultValueObject(path, defaultvalue) {
+    // for collection, default value isin't expected
+    if (path.items === undefined) {
+        path.default = {};
+        path.default.val = (defaultvalue) ? defaultvalue : null;
+    }
+}
+
 function _collectBounded(schemaDataList, flag, parserContext) {
     let schemaData;
     for (let i = 0; i < schemaDataList.length; i++) {
@@ -677,14 +718,16 @@ function _parseBounded(csnDefs, flag, parserContext) {
                                         if (paramObj.$Collection && !paramType.items) {
                                             csnDefs[boundedEntityName].actions[name].params[paramName] = {};
                                             csnDefs[boundedEntityName].actions[name].params[paramName].items = paramType;
-                                            csnDefs[boundedEntityName].actions[name].params[paramName].items["notNull"] = paramObj?.$Nullable ? false : true;
-
+                                            if(paramObj.$Nullable != true){
+                                                csnDefs[boundedEntityName].actions[name].params[paramName].items["notNull"] = true;
+                                            }
                                         } else {
                                             csnDefs[boundedEntityName].actions[name].params[paramName] = paramType;
                                             if (!paramType.items) {
-                                                csnDefs[boundedEntityName].actions[name].params[paramName].notNull = paramObj?.$Nullable ? false : true;
+                                                if(paramObj.$Nullable != true){
+                                                    csnDefs[boundedEntityName].actions[name].params[paramName].notNull = true;
+                                                }
                                             }
-                                        }
                                     }
                                 }
                                 else {
@@ -718,12 +761,16 @@ function _parseBounded(csnDefs, flag, parserContext) {
                                 // check if return type is a collection
                                 if (obj[j].$ReturnType.$Collection && !returnType.items) {
                                     csnDefs[boundedEntityName].actions[name].returns.items = returnType;
-                                    csnDefs[boundedEntityName].actions[name].returns.items["notNull"] = obj[j].$ReturnType?.$Nullable ? false : true
+                                    if(obj[j].$ReturnType.$Nullable != true){
+                                        csnDefs[boundedEntityName].actions[name].returns.items["notNull"] = true;
+                                    }
                                 }
                                 else {
                                     csnDefs[boundedEntityName].actions[name].returns = returnType;
                                     if (!returnType.items) {
-                                        csnDefs[boundedEntityName].actions[name].returns["notNull"] = obj[j].$ReturnType?.$Nullable ? false : true
+                                        if(obj[j].$ReturnType.$Nullable != true){
+                                            csnDefs[boundedEntityName].actions[name].returns["notNull"] = true;
+                                        }
                                     }
                                 }
                             }
@@ -736,6 +783,7 @@ function _parseBounded(csnDefs, flag, parserContext) {
                     }
                 }
             }
+        }
         });
     }
 }
@@ -768,7 +816,7 @@ function _generateCSNForComplexType(schemaData, parserContext) {
     let complexCsn = {};
     let cTypes;
     let propertyType;
-    let baseType;
+    let baseType, isAbstract, isOpenType;
     let enumType;
     cTypes = _collectComplexType(schemaData, parserContext);
     Object.keys(cTypes).forEach(element => {
@@ -778,10 +826,16 @@ function _generateCSNForComplexType(schemaData, parserContext) {
         complexCsn[element].elements = {};
         // inheritance handling
         baseType = cTypes[element].$BaseType;
+        isAbstract = cTypes[element].$Abstract;
+        isOpenType = cTypes[element].$OpenType;
         if (baseType) {
             complexCsn[element].includes = [];
             complexCsn[element].includes.push(baseType);
+            if (!parserContext.complexTypeOpenEntries.includes(baseType)) parserContext.complexTypeOpenEntries.push(baseType);
         }
+        if ((isAbstract || isOpenType) && !parserContext.complexTypeOpenEntries.includes(element)) {
+            parserContext.complexTypeOpenEntries.push(element);
+        }        
         Object.keys(cTypes[element]).forEach(property => { // cTypes[element][property].$Type.startsWith('Edm.')
             if (cTypes[element][property] instanceof Object) {
                 if (!cTypes[element][property].$Type ||
@@ -793,6 +847,9 @@ function _generateCSNForComplexType(schemaData, parserContext) {
                 } else if (parserContext.complexTypes[cTypes[element][property].$Type]) {
                     propertyType = cTypes[element][property];
                     complexCsn[element].elements[property] = _generateComplexTypePropertyCsn(propertyType);
+                } else if (parserContext.typeDefinitions[cTypes[element][property].$Type]) {
+                    propertyType = cTypes[element][property];
+                    complexCsn[element].elements[property] = _generateTypeDefinitionPropertyCsn(propertyType);
                 } else if (parserContext.enumTypes[cTypes[element][property].$Type]) {
                     enumType = cTypes[element][property];
                     complexCsn[element].elements[property] = generatePropertyCsn(enumType, false);
@@ -805,6 +862,12 @@ function _generateCSNForComplexType(schemaData, parserContext) {
             }
         });
     });
+
+    // add @open annotations
+    parserContext.complexTypeOpenEntries.forEach(key => {
+        if (complexCsn[key]) complexCsn[key]['@open'] = true;
+    });
+
     return complexCsn;
 }
 
@@ -870,11 +933,15 @@ function _parseUnbounded(schemaData, flag, parserContext) {
                                 if (objData.$Parameter[i].$Collection && !paramType.items) {
                                     obj[objType].params[objData.$Parameter[i].$Name] = {};
                                     obj[objType].params[objData.$Parameter[i].$Name].items = paramType;
-                                    obj[objType].params[objData.$Parameter[i].$Name].items["notNull"] = objData.$Parameter[i]?.$Nullable ? false : true;
+                                    if(objData.$Parameter[i].$Nullable != true){
+                                        obj[objType].params[objData.$Parameter[i].$Name].items["notNull"] = true;
+                                    }
                                 } else {
                                     obj[objType].params[objData.$Parameter[i].$Name] = paramType;
                                     if (!paramType.items) {
-                                        obj[objType].params[objData.$Parameter[i].$Name]["notNull"] = objData.$Parameter[i]?.$Nullable ? false : true;
+                                        if(objData.$Parameter[i].$Nullable != true){
+                                            obj[objType].params[objData.$Parameter[i].$Name]["notNull"] = true;
+                                        }
                                     }
                                 }
                             }
@@ -909,11 +976,15 @@ function _parseUnbounded(schemaData, flag, parserContext) {
                             if (objData.$ReturnType.$Collection && !returnValue.items) {
                                 obj[objType].returns.items = {};
                                 obj[objType].returns.items = returnValue;
-                                obj[objType].returns.items["notNull"] = objData.$ReturnType?.$Nullable ? false : true;
+                                if(objData.$ReturnType.$Nullable != true){
+                                    obj[objType].returns.items["notNull"] = true;
+                                }
                             } else {
                                 obj[objType].returns = returnValue;
                                 if (!returnValue.items) {
-                                    obj[objType].returns["notNull"] = objData.$ReturnType?.$Nullable ? false : true;
+                                    if(objData.$ReturnType.$Nullable != true){
+                                    obj[objType].returns["notNull"] = true;
+                                }
                                 }
                             }
                         }
@@ -1021,9 +1092,12 @@ function _checkAnnotatationTerm(annotation, path, no_of_terms, targetString, voc
         else if (targetString === "@Core.LongDescription" && annotation[1]["@Core.LongDescription"]) {
             _generateLongDescription(annotation, path, no_of_terms);
         }
-        else if (vocab) {
+        else if (targetString === "@Core.OptionalParameter" && annotation[1]["@Core.OptionalParameter"]) {
+            _captureOptionalParameter(annotation, path);
+        }
+        else if (vocab) { 
             if (vocab.includes(targetString.substring(targetString.indexOf('@') + 1, targetString.lastIndexOf('.')))) {
-                path[targetString] = annotation[1][targetString];
+                path[targetString] = annotation[1][targetString] === null ? true : annotation[1][targetString];
             }
         }
     }
@@ -1194,7 +1268,7 @@ function _generateEDMX2JSON(edmx, name_space, parserContext) {
                 if (missingReferencedDocuments?.length > 0) {
                     console.log(missingReferencedDocuments); // eslint-disable-line no-console
                 }
-                if (_validateJSON(json, parserContext)) {
+                if (_isValidJSON(json, parserContext)) {
                     resolve(json);
                 }
             });
@@ -1221,7 +1295,7 @@ async function getEdmxv4CSN(edmx, ignorePersistenceSkip, mockServerUc, context)
         return new Promise(function getCsn(resolve, reject) {
             try {
                 edmjConverted = JSON.parse(edmx);
-                if (_validateJSON(edmjConverted, parserContext)) {
+                if (_isValidJSON(edmjConverted, parserContext)) {
                     csn = _generateCSN(edmjConverted, ignorePersistenceSkip, mockServerUc, parserContext);
                     if (csn) resolve(csn);
                 }

package/lib/init/constants.js

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

package/lib/init/index.js

@@ -267,8 +267,8 @@ module.exports = class CDSGenerator {
             }
         }
 
-        this.templateList = Array.from(templates.entries()).sort((a, b) => {
-            return OPTIONS_PRIORITY.indexOf(a[0]) - OPTIONS_PRIORITY.indexOf(b[0]);
+        this.templateList = Array.from(templates.entries()).sort(([a], [b]) => {
+            return OPTIONS_PRIORITY.indexOf(a) - OPTIONS_PRIORITY.indexOf(b);
         }).map((entry) => entry[1]);
 
         // check debug to avoid lengthy computation when not in debug mode

package/lib/init/template/_merging/registry-mta.js

@@ -123,9 +123,6 @@ const saasRegistry = {
     }, {
         property: 'parameters.service',
         isEqualTo: 'saas-registry',
-    }, {
-        property: 'parameters.service-plan',
-        isEqualTo: 'application'
     }]
 }
 

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

@@ -0,0 +1,10 @@
+# Please do not modify this file. This file may be overwritten.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "{{ .Release.Name }}-approuter-configmap"
+  namespace: "{{ .Release.Namespace }}"
+data:
+  destinations: >
+    {{ include "cap.approuterDestinations" . }}

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

@@ -0,0 +1,15 @@
+# Please do not modify this file. This file may be overwritten.
+
+{{- $deployment := .Values.approuter }}
+{{- $ := merge (dict "name" "approuter" "deployment" $deployment) . }}
+{{- $approuterUrl := (include "cap.deploymentHostFull" $ )}}
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "{{ .Release.Name }}-approuter-configmap"
+  namespace: "{{ .Release.Namespace }}"
+data:
+  destinations: >
+    {{ include "cap.approuterDestinations" . }}
+  TENANT_HOST_PATTERN: {{ printf "^(.*)-%s" $approuterUrl }}

package/lib/init/template/approuter/files/chart.yaml

@@ -0,0 +1,4 @@
+dependencies:
+  - name: web-application
+    alias: approuter
+    version: 0.1.0

package/lib/init/template/approuter/files/package.json

@@ -1,7 +1,7 @@
 {
   "name": "approuter",
   "dependencies": {
-    "@sap/approuter": "^11.0.0"
+    "@sap/approuter": "^12.0.0"
   },
   "engines": {
     "node": "^16"

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

@@ -0,0 +1,31 @@
+---
+{{#cap.hasXsuaa}}
+xsuaa:
+  parameters:
+    oauth2-configuration:
+      redirect-uris:
+      - https://*.<your-cluster-domain>/**
+{{/cap.hasXsuaa}}
+approuter:
+{{#cap.hasXsuaa}}
+  bindings:
+    auth:
+      serviceInstanceName: xsuaa
+{{/cap.hasXsuaa}}
+  image:
+    repository: <your-container-registry>/{{cap.appName}}-approuter
+    tag: latest
+  resources:
+    limits:
+      ephemeral-storage: 1G
+      memory: 500M
+    requests:
+      ephemeral-storage: 1G
+      cpu: 500m
+      memory: 500M
+  health:
+    liveness:
+      path: /
+    readiness:
+      path: /
+approuterDestinations: {}

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

@@ -9,6 +9,7 @@ const {
     requiredAppAPI, providedAppAPI,
     approuterExtensibility, approuterExtensibilityJava // xs-app.json config
 } = require('../_merging/registry-mta')
+const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5Tracking')
 
 module.exports = class ApprouterTemplate extends require('../templateBase') {
 
@@ -21,16 +22,7 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
         return !!env.requires?.approuter
     }
 
-    async canRun() {
-        const projectDescriptor = await this.projectReader.read(this.options)
-        const { hasMta, hasHelm } = projectDescriptor.cap
-        if (hasHelm && !hasMta) {
-            throw `'cds add approuter' is not available for Kyma yet`
-        }
-        return true
-    }
-
-    async getDependencies() {
+    getDependencies() {
         return [OPTION_XSUAA]
     }
 
@@ -66,9 +58,9 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
         await this.runDependentMerging()
     }
 
-    async runDependentMerging() {
+    async runDependentMerging(context = {}) {
         const projectDescriptor = await this.projectReader.read(this.options)
-        const { isNodejs, isJava, isExtensible, isMultitenant, hasMta } = projectDescriptor.cap
+        const { isNodejs, isJava, isExtensible, isMultitenant, hasMta, hasHelm } = projectDescriptor.cap
 
         if (hasMta) {
             const srv = isNodejs ? srvNode : srvJava
@@ -89,6 +81,62 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
             })
         }
 
+        if (hasHelm) {
+            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'));
+            }
+
+            await mergeYAML(
+                join(this.projectPath, 'chart', 'values.yaml'),
+                join(__dirname, 'files', 'values.yaml.hbs'),
+                projectDescriptor
+            )
+
+            await mergeYAML(
+                join(this.projectPath, 'chart', 'Chart.yaml'),
+                join(__dirname, 'files', 'chart.yaml'),
+                projectDescriptor,
+                { additions: [{
+                    ref: `web-application-approuter`,
+                    in: `dependencies`,
+                    where: [{
+                        property: 'alias',
+                        isEqualTo: 'approuter'
+                    }]
+                }]}
+            )
+            await mergeYAML(
+                join(this.projectPath, 'chart', 'values.yaml'),
+                {
+                  approuter: {
+                    envFrom: [
+                      {
+                        configMapRef: {
+                          name: "{{ .Release.Name }}-approuter-configmap",
+                          tpl: true
+                        }
+                      }
+                    ]
+                  }
+                },
+                projectDescriptor
+            )
+
+            const fileName = isMultitenant ? 'approuter-mtxs-configmap.yaml' : 'approuter-configmap.yaml';
+
+            await copyAndTrack(
+                join(__dirname, 'files', fileName),
+                join(this.projectPath, 'chart', 'templates', 'approuter-configmap.yaml'),
+                context,
+                true
+            )
+
+            if (isIndependentCommand) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData);
+        }
+
         const appPath = join(this.projectPath, projectDescriptor.ui.appPath || 'app')
         const additions = isExtensible && isJava ? [{ ...approuterExtensibilityJava, at: 0 }] :
                           isExtensible && isNodejs ? [{ ...approuterExtensibility, at: 0 }] : []

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

@@ -1,7 +1,7 @@
-const path = require('path')
-const { copy } = require('../../../cds').utils
+const { join } = require('path')
 const ProjectReader = require('../../util/projectReader')
 const { mergeYAML } = require('../../util/merge')
+const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5Tracking')
 const { srvNode, srvJava, auditlog } = require('../_merging/registry-mta')
 
 module.exports = class AuditlogTemplate extends require('../templateBase') {
@@ -18,12 +18,12 @@ module.exports = class AuditlogTemplate extends require('../templateBase') {
         await this.runDependentMerging()
     }
 
-    async runDependentMerging() {
+    async runDependentMerging(context = {}) {
         const projectDescriptor = await this.projectReader.read(this.options)
         const { isNodejs, hasMta, hasHelm } = projectDescriptor.cap
 
         if (hasMta) {
-            const mtaYAMLPath = path.join(this.projectPath, 'mta.yaml')
+            const mtaYAMLPath = join(this.projectPath, 'mta.yaml')
             const srv = isNodejs ? srvNode : srvJava
             await mergeYAML(
                 mtaYAMLPath,
@@ -40,8 +40,16 @@ module.exports = class AuditlogTemplate extends require('../templateBase') {
         }
 
         if (hasHelm) {
+            //in case facet is being added to the already exisiting charts folder
+            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'))
+            }
+
             await mergeYAML(
-                path.join(this.projectPath, 'chart', 'values.yaml'),
+                join(this.projectPath, 'chart', 'values.yaml'),
                 {
                     srv: { bindings: {
                         auditlog: { serviceInstanceName: 'auditlog' }
@@ -50,10 +58,10 @@ module.exports = class AuditlogTemplate extends require('../templateBase') {
                         serviceOfferingName: 'auditlog-api',
                         servicePlanName: 'default'
                     }
-                },
-                null, { forceOverwrite: true }
+                }
             )
-            await copy(path.join(__dirname, 'files', 'auditlog.yaml'), path.join(this.projectPath, 'chart', 'templates', 'auditlog.yaml'))
+            await copyAndTrack(join(__dirname, 'files', 'auditlog.yaml'), join(this.projectPath, 'chart', 'templates', 'auditlog.yaml'), context)
+            if(isIndependentCommand) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData)
         }
     }
 }

package/lib/init/template/cf-manifest/index.js

@@ -1,4 +1,4 @@
-const path = require('path')
+const { join } = require('path')
 const { exists } = require('../../../cds').utils
 const ProjectReader = require('../../util/projectReader');
 const { copyFiles } = require('../../util/templateUtil')
@@ -21,7 +21,7 @@ module.exports = class ManifestTemplate extends require('../templateBase') {
             return true;
         }
 
-        if (exists(path.join(this.projectPath, MANIFEST_FILE)) || exists(path.join(this.projectPath, SERVICES_MANIFEST_FILE))) {
+        if (exists(join(this.projectPath, MANIFEST_FILE)) || exists(join(this.projectPath, SERVICES_MANIFEST_FILE))) {
             throw new Error(`File ${MANIFEST_FILE} or ${SERVICES_MANIFEST_FILE} already exist in current folder. Use --force to overwrite.`);
         }
         return true;
@@ -29,6 +29,6 @@ module.exports = class ManifestTemplate extends require('../templateBase') {
 
     async run() {
         const projectDescriptor = await this.projectReader.read()
-        await copyFiles(path.join(__dirname, 'files'), this.projectPath, projectDescriptor, this.options.force);
+        await copyFiles(join(__dirname, 'files'), this.projectPath, projectDescriptor, this.options.force);
     }
 }