@sap/cds-dk 6.1.5 → 6.2.1

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

@@ -3,9 +3,9 @@
 const path = require('path');
 const TemplateBase = require('../templateBase');
 const ProjectReader = require('../../util/projectReader');
-const { exec } = require('../../../k8s/util');
-const {context, addChart, hasChart } = require('../../../k8s');
-const { rimraf } = require('@sap/cds/lib').utils;
+const { fs, rimraf } = require('../../../cds').utils;
+const { yaml } = require('@sap/cds-foss')
+
 module.exports = class HelmTemplate extends TemplateBase {
     constructor(projectPath, generator) {
         super(projectPath, generator, __dirname);
@@ -13,27 +13,87 @@ module.exports = class HelmTemplate extends TemplateBase {
     }
 
     async checkEnabled() {
-
         if (this.options.force) {
-            await rimraf(this.chartPath());
+            await rimraf(this.chartPath)
             return true;
         }
-
         return true;
     }
 
-    chartPath() {
+    get chartPath() {
         return path.join(this.projectPath, 'chart');
     }
 
     async run() {
-        const PREFIX = 'helm:';
-        const features = new Set();
-        for (const option of this.options.helm && this.options.helm.values() || []) {
-            if (option.startsWith(PREFIX)) features.add(option.substr(PREFIX.length));
-        }
+        const projectDescriptor = await this.projectReader.read(this.options)
+        const { appName, appDescription, appVersion, isJava } = projectDescriptor.cap
+
+        await fs.copy(
+            path.join(__dirname, 'subchart'),
+            path.join(this.projectPath, 'chart', 'charts', 'web-application'),
+        )
+        await fs.copy(
+            path.join(__dirname, 'chart'),
+            path.join(this.chartPath),
+        )
+
+        const webApplicationChartPath = process.env.WEB_APPLICATION_CHART || path.join(__dirname, 'subchart')
+        const chartFilePath = path.join(webApplicationChartPath, 'Chart.yaml')
+        const chartFile = await fs.promises.readFile(chartFilePath, { encoding: 'utf-8' })
+        const { version } = yaml.parse(chartFile)
+
+        await this.templateUtil.mergeYAML(
+            path.join(this.projectPath, 'chart', 'Chart.yaml'),
+            path.join(__dirname, 'files', 'Chart.yaml.hbs'),
+            projectDescriptor, { forceOverwrite: true }
+        )
+
+        await this.templateUtil.mergeYAML(
+            path.join(this.projectPath, 'chart', 'values.yaml'),
+            path.join(__dirname, 'files', 'values.yaml.hbs'),
+            projectDescriptor, { forceOverwrite: true }
+        )
+        await this.runDependentMerging();
+    }
 
-        const project = await context(this.projectPath, features);
-        await addChart(project, path.join(this.projectPath, '/chart'));
+    async runDependentMerging() {
+        const projectDescriptor = await this.projectReader.read()
+        const { hasHana, hasXsuaa, isMultitenant, isExtensible, hasMessaging, hasAuditlog, hasDestination } = projectDescriptor.cap
+
+        if (hasHana) {
+            const HanaTemplate = require(`../hana`)
+            const template = new HanaTemplate(this.projectPath, this.generator)
+            await template.runDependentMerging()
+        }
+        if (hasAuditlog) {
+            const AuditlogTemplate = require(`../auditlog`)
+            const template = new AuditlogTemplate(this.projectPath, this.generator)
+            await template.runDependentMerging()
+        }
+        if (hasMessaging) {
+            const EnterpriseMessagingTemplate = require(`../enterprise-messaging`)
+            const template = new EnterpriseMessagingTemplate(this.projectPath, this.generator)
+            await template.runDependentMerging()
+        }
+        if (hasDestination) {
+            const DestinationsTemplate = require(`../destinations`)
+            const template = new DestinationsTemplate(this.projectPath, this.generator)
+            await template.runDependentMerging()
+        }
+        if (hasXsuaa) {
+            const XsuaaTemplate = require(`../xsuaa`)
+            const template = new XsuaaTemplate(this.projectPath, this.generator)
+            await template.runDependentMerging()
+        }
+        if (isMultitenant) {
+            const MultitenancyTemplate = require(`../multitenancy`)
+            const template = new MultitenancyTemplate(this.projectPath, this.generator)
+            await template.runDependentMerging()
+        }
+        if (isExtensible) {
+            const ExtensibilityTemplate = require(`../extensibility`)
+            const template = new ExtensibilityTemplate(this.projectPath, this.generator)
+            await template.runDependentMerging()
+        }
     }
 };

package/lib/{k8s/html5-apps-deployer/templates → init/template/html5-repo/files}/html5-apps-deployer-job.yaml

@@ -3,7 +3,7 @@
 
 {{- $ := merge (dict "root" . "name" "html5-apps-deployer") .Values.html5_apps_deployer . }}
 {{- if $.backendDestinations }}
-  {{- if not (.Values.destinations.parameters.HTML5Runtime_enabled) }}
+  {{- if not (.Values.destination.parameters.HTML5Runtime_enabled) }}
     {{- fail "destinations.parameters.HTML5Runtime_enabled must be set to true for use with Launchpad Service" }}
   {{- end }}
 {{- end }}

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

@@ -0,0 +1,59 @@
+const path = require('path')
+const TemplateBase = require('../templateBase')
+const ProjectReader = require('../../util/projectReader')
+const { srvNode, srvJava, auditlog } = require('../_merging/registry-mta')
+const { OPTION_DESTINATIONS } = require('../../constants')
+const cds = require('../../../cds'), { fs } = cds.utils
+
+module.exports = class Html5RepoTemplate extends TemplateBase {
+    constructor(projectPath, generator) {
+        super(projectPath, generator, __dirname)
+        this.projectReader = new ProjectReader(this)
+    }
+
+    async getDependencies() {
+        return [OPTION_DESTINATIONS]
+    }
+
+    async run() {
+        await this.runDependentMerging()
+    }
+
+    async runDependentMerging() {
+        const projectDescriptor = await this.projectReader.read(this.options)
+        const { appName, hasHelmDeployment } = projectDescriptor.cap
+
+        if (hasHelmDeployment) {
+            await this.templateUtil.mergeYAML(
+                path.join(this.projectPath, 'chart', 'values.yaml'),
+                {
+                    html5_apps_repo_host: {
+                        serviceOfferingName: 'html5-apps-repo',
+                        servicePlanName: 'app-host'
+                    },
+                    html5_apps_deployer: {
+                        cloudService: null,
+                        backendDestinations: {},
+                        image: {
+                            repository: `<your-container-registry>/${appName}-html5-deployer`,
+                            tag: 'latest'
+                        },
+                        bindings: {
+                            xsuaa:           { serviceInstanceName: 'xsuaa' },
+                            destination:     { serviceInstanceName: 'destination' },
+                            html5_apps_repo: { serviceInstanceName: 'html5-apps-repo-host' }
+                        },
+                        resources: {
+                            limits:   { cpu: '2000m', memory: '1G' },
+                            requests: { cpu: '1000m', memory: '1G' }
+                        }
+                    }
+                },
+                null, { forceOverwrite: true }
+            )
+            await fs.copy(path.join(__dirname, 'files', '_html5_deployment_helpers.tpl'), path.join(this.projectPath, 'chart', 'templates', '_html5_deployment_helpers.tpl'))
+            await fs.copy(path.join(__dirname, 'files', 'html5-apps-deployer-job.yaml'), path.join(this.projectPath, 'chart', 'templates', 'html5-apps-deployer-job.yaml'))
+            await fs.copy(path.join(__dirname, 'files', 'html5-apps-repo-host.yaml'), path.join(this.projectPath, 'chart', 'templates', 'html5-apps-repo-host.yaml'))
+        }
+    }
+}

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

@@ -12,6 +12,14 @@ module.exports = class KibanaTemplate extends TemplateBase {
         this.projectReader = new ProjectReader(this)
     }
 
+    async checkEnabled() {
+        const projectDescriptor = await this.projectReader.read(this.options)
+        const { hasMtaDeployment, hasHelmDeployment } = projectDescriptor.cap
+        if (hasHelmDeployment && !hasMtaDeployment) {
+            throw `'cds add kibana-logging' is not available for Kyma yet`
+        }
+    }
+
     async runDependentMerging() {
         const projectDescriptor = await this.projectReader.read(this.options)
         const { hasMtaDeployment, isNodejs } = projectDescriptor.cap

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

@@ -8,9 +8,8 @@ const io = require("../../../lint/io");
 const readline = require("readline");
 
 const { OPTION_LINT_DEV, OPTION_LINT_GLOBAL } = require("../../constants");
-const { mkdirp, fs } = require("@sap/cds").utils;
+const { mkdirp, fs } = require("../../../cds").utils;
 const { getConfigPath, getFileExtensions } = require("@sap/eslint-plugin-cds/lib/api");
-const generators = require("../../../lint/generators");
 
 const IS_WIN = os.platform() === "win32";
 const ALLOWED_FILE_EXTENSIONS = getFileExtensions();
@@ -68,8 +67,6 @@ module.exports = class LintTemplate extends TemplateBase {
         if (!fs.existsSync(".eslint/tests/no-entity-moo.test.js")) {
           await this._copyFromTemplate(".eslint/tests", this.testsPath);
         }
-        // Generate custom lint rules docs
-        await generators.genDocs(this.projectPath);
       }
 
       // Generate VS Code extension settings

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

@@ -5,12 +5,13 @@ version: {{cap.appVersion}}
 description: "{{cap.appDescription}}"
 parameters:
   enable-parallel-deployments: true
+{{#cap.isNodejs}}
 build-parameters:
   before-all:
     - builder: custom
       commands:
-        - npx -p @sap/cds-dk{{#cap.isJava}}@^6{{/cap.isJava}} cds build --production
-
+        - npx -p @sap/cds-dk cds build --production
+{{/cap.isNodejs}}
 modules:
   - name: {{cap.appName}}-srv
     type: {{cap.pLanguage}}

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

@@ -11,7 +11,7 @@ module.exports = class MtaTemplate extends TemplateBase {
 
     async run() {
         const projectDescriptor = await this.projectReader.read();
-        const { hasApprouter, hasHana, hasXsuaa, isMultitenant, isExtensible } = projectDescriptor.cap;
+        const { hasApprouter, hasHana, hasXsuaa, isMultitenant, isExtensible, hasMessaging } = projectDescriptor.cap;
         if (!existsSync(join(this.projectPath, 'mta.yaml'))) {
             await this.templateUtil.copyFiles('.', this.projectPath, projectDescriptor);
         }
@@ -44,5 +44,10 @@ module.exports = class MtaTemplate extends TemplateBase {
             const template = new ExtensibilityTemplate(this.projectPath, this.generator)
             await template.runDependentMerging()
         }
+        if (hasMessaging) {
+            const EnterpriseMessagingTemplate = require(`../enterprise-messaging`)
+            const template = new EnterpriseMessagingTemplate(this.projectPath, this.generator)
+            await template.runDependentMerging()
+        }
     }
 }

package/lib/init/template/multitenancy/files/java/.cdsrc.json

@@ -15,5 +15,8 @@
         }
       }
     ]
+  },
+  "requires": {
+    "multitenancy": true
   }
 }

package/lib/init/template/multitenancy/files/java/package.json

@@ -18,13 +18,9 @@
   },
   "cds": {
     "requires": {
-      "db": {
-        "kind": "sqlite",
-        "[production]": {
-          "kind": "hana-mt"
-        }
-      },
+      "db": "sql-mt",
       "cds.xt.ModelProviderService": "in-sidecar",
+      "cds.xt.DeploymentService": true,
       "cds.xt.SaasProvisioningService": true
     }
   }

package/lib/{k8s/multitenancy/templates → init/template/multitenancy/files}/saas-registry.yaml

@@ -1,8 +1,8 @@
 {{- if (default dict .Values.multitenancy).enabled }}
   {{- $srvHostFull := include "cap.deploymentHostFull" (merge (dict "name" "srv" "deployment" .Values.srv) . ) }}
   {{- $defaultAppUrls := dict
-    "getDependencies" (print "https://" $srvHostFull "/mtx/v1/provisioning/dependencies")
-    "onSubscription" (print "https://" $srvHostFull "/mtx/v1/provisioning/tenant/{tenantId}")
+    "getDependencies" (print "https://" $srvHostFull "/-/cds/saas-provisioning/dependencies")
+    "onSubscription" (print "https://" $srvHostFull "/-/cds/saas-provisioning/tenant/{tenantId}")
     "onSubscriptionAsync" false
     "onUnSubscriptionAsync" false
     "callbackTimeoutMillis" 300000
@@ -16,4 +16,4 @@
       "appUrls" $defaultAppUrls
   }}
   {{- include "cap.service-instance" (merge (dict "defaultParameters" $defaultParameters . )) }}
-{{ end }}
+{{ end }}

package/lib/init/template/multitenancy/files/xsuaa.yaml

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

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

@@ -15,9 +15,26 @@ module.exports = class MultitenancyTemplate extends TemplateBase {
     this.projectReader = new ProjectReader(this)
   }
 
+  async run() {
+    const projectDescriptor = await this.projectReader.read(this.options)
+    const { for: forProfile, isNodejs, isJava } = projectDescriptor.cap
+    if (isNodejs) {
+      const packageJSONPath = path.join(this.projectPath, 'package.json')
+      const cdsTemplateFile = forProfile ? 'cds.package.json.hbs' : 'cds.package.json'
+      await this.templateUtil.mergeJSON(packageJSONPath, path.join(__dirname, 'files', cdsTemplateFile), projectDescriptor)
+      await this.templateUtil.mergeJSON(packageJSONPath, path.join(__dirname, 'files', 'dependencies.package.json'))
+      await this.templateUtil.sortDependencies(packageJSONPath)
+    } else if (isJava) {
+      const cdsrcJSONPath = path.join(this.projectPath, '.cdsrc.json')
+      await this.templateUtil.mergeJSON(cdsrcJSONPath, path.join(__dirname, 'files', 'java', '.cdsrc.json'))
+      await fs.copy(path.join(__dirname, 'files', 'java', 'package.json'), path.join(this.projectPath, 'mtx', 'sidecar', 'package.json'))
+    }
+    await this.runDependentMerging()
+  }
+
   async runDependentMerging() {
     const projectDescriptor = await this.projectReader.read()
-    const { isNodejs, isJava, hasMtaDeployment, hasApprouter, hasXsuaa, hasHana } = projectDescriptor.cap
+    const { isNodejs, isJava, hasMtaDeployment, hasHelmDeployment, hasApprouter, hasXsuaa, hasHana } = projectDescriptor.cap
 
     if (hasMtaDeployment) {
       const modules = isNodejs ? [srvNode] : [srvJava, mtxSidecar]
@@ -25,11 +42,14 @@ module.exports = class MultitenancyTemplate extends TemplateBase {
       const services = [saasRegistry]
       if (hasXsuaa) services.push(xsuaa)
       const apis = isNodejs ? [providedMtxAPI] : [srvAPI, providedMtxAPI, providedMtxSidecarAPI, requiredMtxSidecarAPI]
+      const additions = [...modules, ...services, ...apis]
+
+      const overwrites = hasXsuaa ? [{ item: [xsuaa, 'parameters.config.tenant-mode'], withValue: 'shared'}] : []
+
       const relationships =  [{
         insert: [saasRegistry, 'name'],
         into: [srv, 'requires', 'name']
       }]
-
       if (isJava) {
         if (hasXsuaa) {
           relationships.push({
@@ -45,19 +65,35 @@ module.exports = class MultitenancyTemplate extends TemplateBase {
         }
       }
 
-      const mergingRules = {
-        additions: [...modules, ...services, ...apis],
-        overwrites: hasXsuaa ? [{ // TODO: the hasXsuaa should not be necessary
-          item: [xsuaa, 'parameters.config.tenant-mode'],
-          withValue: 'shared'
-        }] : undefined,
-        relationships,
-      }
-      const mtaPath = path.join(this.projectPath, 'mta.yaml')
       const templateMtaPath = path.join(__dirname, `files`, `mta.yaml.hbs`)
+      const mtaPath = path.join(this.projectPath, 'mta.yaml')
+      const mergingRules = { additions, overwrites, relationships }
       await this.templateUtil.mergeYAML(mtaPath, templateMtaPath, projectDescriptor, mergingRules)
     }
 
+    if (hasHelmDeployment) {
+      await this.templateUtil.mergeYAML(
+        path.join(this.projectPath, 'chart', 'values.yaml'),
+        {
+          xsuaa: {
+            serviceOfferingName: 'saas-registry',
+            servicePlanName: 'application'
+          }
+        },
+        null, { forceOverwrite: true }
+      )
+      //if (hasXsuaa) { // REVISIT: Can we get rid of this dependency?
+        await fs.copy(
+          path.join(__dirname, 'files', 'xsuaa.yaml'),
+          path.join(this.projectPath, 'chart', 'templates', 'xsuaa.yaml')
+        )
+      //}
+      await fs.copy(
+        path.join(__dirname, 'files', 'saas-registry.yaml'),
+        path.join(this.projectPath, 'chart', 'templates', 'saas-registry.yaml')
+      )
+    }
+
     if (hasApprouter) {
       const ApprouterTemplate = require(`../approuter`)
       const template = new ApprouterTemplate(this.projectPath, this.generator)
@@ -88,22 +124,13 @@ module.exports = class MultitenancyTemplate extends TemplateBase {
         }
       )
     }
-  }
 
-  async run() {
-    const projectDescriptor = await this.projectReader.read(this.options)
-    const { for: forProfile, isNodejs, isJava } = projectDescriptor.cap
-    if (isNodejs) {
-      const packageJSONPath = path.join(this.projectPath, 'package.json')
-      const cdsTemplateFile = forProfile ? 'cds.package.json.hbs' : 'cds.package.json'
-      await this.templateUtil.mergeJSON(packageJSONPath, path.join(__dirname, 'files', cdsTemplateFile), projectDescriptor)
-      await this.templateUtil.mergeJSON(packageJSONPath, path.join(__dirname, 'files', 'dependencies.package.json'))
-      await this.templateUtil.sortDependencies(packageJSONPath)
-    } else if (isJava) {
-      const cdsrcJSONPath = path.join(this.projectPath, '.cdsrc.json')
-      await this.templateUtil.mergeJSON(cdsrcJSONPath, path.join(__dirname, 'files', 'java', '.cdsrc.json'))
-      await fs.copy(path.join(__dirname, 'files', 'java', 'package.json'), path.join(this.projectPath, 'mtx', 'sidecar', 'package.json'))
+    if (hasXsuaa && hasHelmDeployment) {
+      // REVISIT: Shared xs-security.json location for Helm and MTA?
+      await fs.copy(
+        path.join(this.projectPath, 'xs-security.json'),
+        path.join(this.projectPath, 'chart', 'xs-security.json')
+      )
     }
-    await this.runDependentMerging()
   }
 }

package/lib/init/template/nodejs/files/.gitignore.hbs

@@ -1,6 +1,7 @@
 # CAP {{ projectName }}
 _out
 *.db
+*.sqlite
 connection.properties
 default-*.json
 .cdsrc-private.json

package/lib/init/template/templateBase.js

@@ -1,4 +1,4 @@
-const cds = require('@sap/cds');
+const cds = require('../../cds');
 const path = require('path');
 
 const TemplateUtil = require('../util/templateUtil');

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

@@ -0,0 +1,10 @@
+srv:
+  bindings:
+    auth:
+      serviceInstanceName: xsuaa
+xsuaa:
+  serviceOfferingName: xsuaa
+  servicePlanName: application
+  parameters:
+    xsappname: {{cap.appName}}
+  config: xs-security.json

package/lib/init/template/xsuaa/files/xsuaa.yaml

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

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

@@ -1,8 +1,9 @@
 const path = require('path')
+const cds = require('../../../cds'), { fs } = cds.utils
 const TemplateBase = require('../templateBase')
 const ProjectReader = require('../../util/projectReader')
 const { srvNode, srvJava, xsuaa, mtxSidecar } = require('../_merging/registry-mta')
-const { PROJECT_TYPE, OPTION_HELM_UPDATE } = require('../../constants')
+const { PROJECT_TYPE } = require('../../constants')
 
 module.exports = class XsuaaTemplate extends TemplateBase {
     constructor(projectPath, generator) {
@@ -12,7 +13,24 @@ module.exports = class XsuaaTemplate extends TemplateBase {
 
     async runDependentMerging() {
         const projectDescriptor = await this.projectReader.read(this.options)
-        const { isMultitenant, isExtensible, hasMtaDeployment, isNodejs, isJava } = projectDescriptor.cap
+        const { isMultitenant, isExtensible, hasMtaDeployment, hasHelmDeployment, isNodejs, isJava } = projectDescriptor.cap
+
+        const cds = require('../../../../lib/compile')
+        const xsSecurity = await (async () => { try {
+            const models = await cds.load(path.join(this.projectPath, cds.env.folders.srv))
+            return cds.compile.to.xsuaa(models)
+        } catch (error) { /* ignore */ }
+        })() || { scopes: [], attributes: [], 'role-templates': [], 'authorities-inheritance': false }
+        const mergingSemantics = { additions: xsSecurity.scopes.map(scope => ({
+            ref: scope.name,
+            in: 'scopes',
+            where: [{
+                property: 'name',
+                isEqualTo: scope.name
+            }],
+        }))}
+        const xsSecurityPath = path.join(this.projectPath, 'xs-security.json')
+        await this.templateUtil.mergeJSON(xsSecurityPath, xsSecurity, projectDescriptor, mergingSemantics)
 
         if (hasMtaDeployment) {
             const srv = isNodejs ? srvNode : srvJava
@@ -40,6 +58,20 @@ module.exports = class XsuaaTemplate extends TemplateBase {
             )
         }
 
+        if (hasHelmDeployment) {
+            await fs.copy(path.join(__dirname, 'files', 'xsuaa.yaml'), path.join(this.projectPath, 'chart', 'templates', 'xsuaa.yaml'))
+            await this.templateUtil.mergeYAML(
+                path.join(this.projectPath, 'chart', 'values.yaml'),
+                path.join(__dirname, 'files', 'values.yaml.hbs'),
+                projectDescriptor, { forceOverwrite: true }
+            )
+            // REVISIT: Shared xs-security.json location for Helm and MTA?
+            await fs.copy(
+                path.join(this.projectPath, 'xs-security.json'),
+                path.join(this.projectPath, 'chart', 'xs-security.json')
+            )
+        }
+
         // Re-applying the merging part of `cds add mtx` because cds.compile.to.xsuaa
         // has overwritten the existing `xs-security.json`.
         // TODO: Find a generic solution for situation like these.
@@ -80,27 +112,7 @@ module.exports = class XsuaaTemplate extends TemplateBase {
                 break
             }
         }
-        const cds = require('../../../../lib/compile')
-        const xsuaa = await (async () => { try {
-            const models = await cds.load(path.join(projectPath, cds.env.folders.srv))
-            return cds.compile.to.xsuaa(models)
-        } catch (error) { /* ignore */ }
-        })() || { scopes: [], attributes: [], 'role-templates': [], 'authorities-inheritance': false }
 
-        const mergingSemantics = { additions: xsuaa.scopes.map(scope => ({
-            ref: scope.name,
-            in: 'scopes',
-            where: [{
-                property: 'name',
-                isEqualTo: scope.name
-            }],
-        }))}
-        const xsSecurityPath = path.join(projectPath, 'xs-security.json')
-        await this.templateUtil.mergeJSON(xsSecurityPath, xsuaa, projectDescriptor, mergingSemantics)
         await this.runDependentMerging()
     }
-
-    async getDependencies() {
-        return [OPTION_HELM_UPDATE];
-    }
 }

package/lib/init/util/fsUtil.js

@@ -1,7 +1,7 @@
 const fs = require('fs').promises;
 const path = require('path');
 
-const {yaml} = require('@sap/cds-foss')
+const {yaml:YAML} = require('@sap/cds-foss')
 const JSONC = require('../../util/jsonc');
 
 const UTF_8 = 'utf-8';
@@ -30,7 +30,7 @@ module.exports = class FsUtil {
     }
 
     async writeYAML(filepath, yaml, skipFileLog = false) {
-        await this.writeFile(filepath, String(yaml), skipFileLog);
+        await this.writeFile(filepath, YAML.stringify(yaml, { collectionStyle: 'block' }), skipFileLog);
     }
 
     async readFile(src) {
@@ -53,13 +53,19 @@ module.exports = class FsUtil {
     }
 
     async readYAML(src, projectDescriptor) {
-        const file = await this.readFile(src);
+        let file;
+        try {
+            file = await this.readFile(src);
+        } catch (e) {
+            if (e.code === 'ENOENT') return undefined;
+            throw e;
+        }
         if (projectDescriptor) {
             const Mustache = require('mustache');
             const renderedFile = Mustache.render(file, projectDescriptor);
-            return yaml.parseDocument(renderedFile);
+            return YAML.parseDocument(renderedFile);
         }
-        return yaml.parseDocument(file);
+        return YAML.parseDocument(file);
     }
 
     // eslint-disable-next-line no-unused-vars