@sap/cds-dk 7.3.0 → 7.3.1

package/lib/build/provider/edmxBuildPlugin.js

@@ -51,7 +51,11 @@ class EdmxBuildPlugin extends FeatureToggleBuildPlugin {
     }
 
     _isOdataProtocol(srv) {
-        return cds.service.protocols.protocol4(srv).startsWith('odata')
+        let protocols = cds.service.protocols.protocol4(srv)
+        if (typeof protocols === "string") {
+            protocols = [protocols]
+        }
+        return protocols.some(p => p && p.startsWith('odata'))
     }
 
     _options4odata() {

package/lib/build/provider/featureToggleBuildPlugin.js

@@ -125,8 +125,8 @@ class FeatureToggleBuildPlugin extends InternalBuildPlugin {
     _validateFeature(ftCsn, baseCsn) {
         // features must not have other dependencies than base model dependencies - cross feature dependencies are not supported
         // do not pass options.messages in order to avoid duplicate compiler messages
-        // version 2.13.9 of compileSources does not read the requires definition of parsed CSNs
-        cds.compiler.compileSources({ '../..csn.json': baseCsn, 'feature.csn': ftCsn }, this.options())
+        // version 2.13.9 of compileSources does not read the 'requires' definition of parsed CSNs
+        cds.compiler.compileSources({ [ftCsn.requires[0]]: baseCsn, 'feature.csn': ftCsn }, this.options())
     }
 }
 

package/lib/build/provider/internalBuildPlugin.js

@@ -22,6 +22,10 @@ class InternalBuildPlugin extends BuildPlugin {
         return InternalBuildPlugin.PRIORITY_MAX_VALUE
     }
 
+    init() { 
+        // REVISIT: no default gen folder for now
+    }
+
     async clean() {
         // build results are deleted by the BuildTaskEngine if the build.target !== '.'
         // make sure that src is not a subfolder of dest

package/lib/build/provider/internalBuildTaskProvider.js

@@ -43,7 +43,7 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
         InternalBuildTaskProvider._setDefaultModel(task)
     }
 
-    loadPlugin(task) {
+    getPluginClass(task) {
         return require(`./${InternalBuildTaskProvider._getForValueFromTask(task)}`)
     }
 

package/lib/build/provider/java/index.js

@@ -2,8 +2,8 @@ const fs = require('fs')
 const path = require('path')
 const cds = require('../../../cds')
 const EdmxBuildPlugin = require('../edmxBuildPlugin')
-const { OUTPUT_MODE, OUTPUT_MODE_RESULT, FILE_EXT_CDS, CONTENT_LANGUAGE_BUNDLES, CONTENT_DEFAULT_CSN, DEFAULT_CSN_FILE_NAME, 
-    OUTPUT_MODE_FILESYSTEM, FLAVOR_LOCALIZED_EDMX } = require('../../constants')
+const { OUTPUT_MODE, OUTPUT_MODE_RESULT, FILE_EXT_CDS, CONTENT_LANGUAGE_BUNDLES, CONTENT_DEFAULT_CSN, DEFAULT_CSN_FILE_NAME,
+    OUTPUT_MODE_FILESYSTEM, FLAVOR_LOCALIZED_EDMX, CONTENT_EDMX, CONTENT_LOCALIZED_EDMX } = require('../../constants')
 const { getI18nDefaultFolder } = require('../../util')
 const DEFAULT_COMPILE_DEST_FOLDER = path.normalize('src/main/resources/edmx')
 
@@ -20,11 +20,17 @@ class JavaBuildPlugin extends EdmxBuildPlugin {
         if (!model) {
             return
         }
-
-        // generate edmx files containing all features
         const odata = await this._compileForOdata(model, compileDest)
-        await this.compileToEdmx(odata, compileDest) // localized edmx for backward compatibility
-        await this.compileToEdmx(odata, path.join(compileDest, 'odata', cds.env.odata.version), { [FLAVOR_LOCALIZED_EDMX]: false }) // non-localized edmx
+
+        if (!this.hasBuildOption(CONTENT_EDMX, false)) {
+            // generate edmx files containing all features
+            // localized edmx for backward compatibility
+            if (!this.hasBuildOption(CONTENT_LOCALIZED_EDMX, false)) {
+                await this.compileToEdmx(odata, compileDest, { [FLAVOR_LOCALIZED_EDMX]: true })
+            }
+            // non-localized edmx
+            await this.compileToEdmx(odata, path.join(compileDest, 'odata', cds.env.odata.version), { [FLAVOR_LOCALIZED_EDMX]: false })
+        }
 
         if (!this.hasBuildOption(CONTENT_LANGUAGE_BUNDLES, false)) {
             // collect and write language bundles containing all features

package/lib/build/util.js

@@ -208,6 +208,10 @@ function _locationString(loc) {
         : `${loc.file}:${loc.line}.${loc.col}-${loc.endLine}.${loc.endCol}`;
 }
 
+async function pathExists(path) {
+    return fs.promises.access(path).then(() => true).catch(() => false);
+}
+
 /**
  * Class for individual build message.
  *
@@ -271,6 +275,7 @@ module.exports = {
     getI18nDefaultFolder,
     isClassicMtx,
     normalizePath,
+    pathExists,
     BuildMessage,
     BuildError
 }

package/lib/client/download_legacy.js

@@ -13,10 +13,6 @@ const DOWNLOAD_FILE_NAME = 'migrated_projects.tgz'; // TODO try to add tenant la
 module.exports = class Download extends BaseCommand {
 
     static async run(paramValues) {
-        if (!tar) {
-            throw `cds pull requires @sap/cds version >= 6.2. Current version is ${cds.version}\n`;
-        }
-
         const params = await login(paramValues);
 
         const projectFolder = params.get('projectFolder');
@@ -31,17 +27,16 @@ module.exports = class Download extends BaseCommand {
         const downloadedTgz = await this.getTgz(params);
         await fs.promises.writeFile(downloadPath, downloadedTgz);
 
-        //await tar.xz(baseModelTgz).to(target); // expand if feature is requested later
-
         console.log(`Finished.`);
     }
 
     static async getTgz(params) {
         const tagRule = params.get('tagRule');
+        const defaultTag = params.get('defaultTag');
         const downloadUrl = `${(params.get('appUrl'))}/-/cds/extensibility/getMigratedProjects`;
         const options = { ...params.get('reqAuth'), responseType: 'arraybuffer' };
 
-        return axios.post(downloadUrl, { tagRule }, options)
+        return axios.post(downloadUrl, { tagRule, defaultTag }, options)
             .then(response => Buffer.from(response.data))
             .catch(error => this.handleHttpError(error, params, { url: downloadUrl }));
     }

package/lib/client/params.js

@@ -163,6 +163,7 @@ class BasicParams {
         this.directory              = this.projectFolder.newAlias('directory');
 
         this.tagRule                = new Param('tagRule', '');
+        this.defaultTag             = new Param('defaultTag', '');
 
         // - non-persisted, internal
         this.reqAuth                = new Param('reqAuth',                null, { obfuscate: ObfuscationLevel.full, internal: true });

package/lib/client/settings_manager.js

@@ -215,29 +215,31 @@ class SettingsManager {
 
     static async updateUrls(params, logout, loadedAppUrl) {
         async function addAppUrl() {
-            // Prefix URL schema
-            if (params.has('appUrl')) {
-                const appUrl = params.get('appUrl');
-                if (!schemaRegex.test(appUrl)) {
-                    if (localhostRegex.test(appUrl)) {
-                        params.set('appUrl', httpSchema + appUrl);
-                    } else {
-                        params.set('appUrl', httpsSchema + appUrl);
-                    }
-                    DEBUG?.(`Added schema to app URL: ${params.get('appUrl')}`);
-                }
-            }
-
             if (!logout && !params.has('appUrl')) {
                 // Get appUrl from CF
                 DEBUG?.('App URL not given');
                 await getAppUrlAndSubdomainFromSuggestions(params);
             }
 
-            // Check required param: appUrl
             if (!params.has('appUrl')) {
                 throw 'App URL not given. Please specify it or log in to Cloud Foundry and repeat this command.';
             }
+
+            // Prefix URL schema
+            let appUrl = params.get('appUrl');
+            if (appUrl.endsWith('/')) {
+                appUrl = appUrl.replace(/\/+$/, '');
+                DEBUG?.(`Removed trailing slash from app URL: ${appUrl}`);
+            }
+            if (!schemaRegex.test(appUrl)) {
+                if (localhostRegex.test(appUrl)) {
+                    appUrl = httpSchema + appUrl;
+                } else {
+                    appUrl = httpsSchema + appUrl;
+                }
+                DEBUG?.(`Added schema to app URL: ${appUrl}`);
+            }
+            params.set('appUrl', appUrl);
         }
         async function renewTokenUrl() {
             const renewUrl = params.get('appUrl') !== loadedAppUrl;

package/lib/compile/openapi/csdl2openapi.js

@@ -64,7 +64,7 @@ module.exports.csdl2openapi = function (
     csdl = JSON.parse(JSON.stringify(csdl))
     csdl.$Version = odataVersion ? odataVersion : '4.01'
     serviceRoot = serviceRoot || (scheme + '://' + host + basePath);
-    const queryOptionPrefix = csdl.$Version <= '4.0' ? '$' : '';
+    const queryOptionPrefix = csdl.$Version <= '4.01' ? '$' : '';
     const typesToInline = {}; // filled in schema() and used in inlineTypes()
     const boundOverloads = {};
     const derivedTypes = {};

package/lib/index.js

@@ -23,3 +23,9 @@ cds.schema = cds.schema || {} // backward compatibility
 cds.extend (cds.schema) .with ( {
   overlay4: require('./env/schema')
 })
+
+// set build API, potentially removing the old API facade from sap/cds 7
+delete cds.__proto__?.build
+cds.extend (cds.constructor) .with (class {
+  get build() { return super.build = require('./build') }
+})

package/lib/init/constants.js

@@ -40,7 +40,8 @@ module.exports = {
         LINT_DEV: 'lint:dev',
         HELM: 'helm',
         TYPER: 'typer',
-        HTML5_REPO: 'html5-repo'
+        HTML5_REPO: 'html5-repo',
+        NOTIFICATIONS: 'notifications'
     }),
 
     PROJECT_TYPE: Object.freeze({ nodejs: 1, java: 2, unknown: 3 }),

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

@@ -112,6 +112,17 @@ const hdiContainer = {
     }]
 }
 
+const notificationTypesDeployer = {
+    in: 'modules',
+    where: [{
+        property: 'name',
+        isEqualTo: 'notification-content-deployment'
+    }, {
+        property: 'type',
+        isEqualTo: 'nodejs'
+    }]
+}
+
 const serviceManager = {
     in: 'resources',
     where: [{
@@ -273,6 +284,7 @@ module.exports = {
     enterpriseMessaging,
     hdbDeployer,
     hdiContainer,
+    notificationTypesDeployer,
     serviceManager,
     postgres,
     postgresDeployer,

package/lib/init/template/helm/subcharts/content-deployment/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
-name: content-deployment
 description: A Helm Chart for creating a Content Deployment job
-type: application
-version: 0.1.0
+name: content-deployment
 sources:
-- "https://github.tools.sap/unified-runtime/content-deployment"
+- https://github.tools.sap/unified-runtime/content-deployment
+type: application
+version: 1.3.0

package/lib/init/template/helm/subcharts/content-deployment/templates/_helpers.tpl

@@ -118,6 +118,8 @@ Name of the imagePullSecret
 {{- $ips.global.name }}
 {{- else if or $ips.local.dockerconfigjson $ips.global.dockerconfigjson }}
 {{- include "content-deployment.internal.fullname" . }}
+{{- else }}
+{{- "image-pull-secret" }}
 {{- end }}
 {{- end }}
 
@@ -128,9 +130,9 @@ Calculate the final image name
 {{- $tag := .Values.image.tag | default .Values.global.image.tag | default "latest" }}
 {{- $registry := .Values.image.registry | default .Values.global.image.registry }}
 {{- if $registry }}
-{{- $registry | trimSuffix "/" }}/{{ .Values.image.repository }}:{{ $tag }}
+{{- $registry | trimSuffix "/" | trimPrefix "https://" }}/{{ .Values.image.repository | trimSuffix "/" }}:{{ $tag }}
 {{- else }}
-{{- .Values.image.repository }}:{{ $tag }}
+{{- .Values.image.repository | trimSuffix "/" | trimPrefix "https://" }}:{{ $tag }}
 {{- end }}
 {{- end }}
 

package/lib/init/template/helm/subcharts/content-deployment/templates/job.yaml

@@ -50,15 +50,16 @@ spec:
             drop:
             - ALL
           privileged: false
+          runAsNonRoot: true
+          {{- if .Values.runAsUser }}
+          runAsUser: {{ .Values.runAsUser }}
+          {{- end }}
           readOnlyRootFilesystem: false
         volumeMounts:
         - mountPath: /tmp
           name: tmp
         {{- include "content-deployment.internal.serviceMounts" . | nindent 8 }}
       restartPolicy: OnFailure
-      securityContext:
-        runAsNonRoot: true
-        runAsUser: 1000
       volumes:
       - name: tmp
         emptyDir: {}