@sap/cds-dk 6.0.1 → 6.0.4

package/CHANGELOG.md

@@ -6,6 +6,36 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 6.0.4 - 2022-08-02
+
+### Changed
+
+- `cds init` uses latest Maven Java archetype version 1.26.1 for creating Java projects.
+- Use `@sap/cds` 6.0.4
+- `cds bind` handles orgs and spaces containing commas correctly.
+
+
+## Version 6.0.3 - 2022-07-14
+
+### Changed
+
+- `cds init` uses latest Maven Java archetype version 1.26.0 for creating Java projects.
+- `cds init` now creates Node.js projects with version 6 of `@sap/cds`
+
+### Fixed
+
+- `--vcap-file` parameter of `cds deploy` is available again (removed in 6.0.0)
+- `cds add helm:connectivity`: `connectivity.configMapName` was not used for the `connectivity-proxy-info`.
+- `cds add helm:connectivity`: Environment variables added for connectivity service for Java.
+- `cds add helm`: Generation of `xs-security.json` file works on Windows now (`cds compile srv -2 xsuaa` command failed).
+
+
+## Version 6.0.2 - 2022-07-06
+
+### Changed
+
+- Use `@sap/cds` 6.0.2
+
 ## Version 6.0.1 - 2022-07-05
 
 ### Changed

package/bin/cds.js

@@ -67,8 +67,12 @@ const cli = { //NOSONAR
 
 const DEBUG = /\b(cli)\b/.test (process.env.DEBUG) && console.error
 
-function _local (id) {
-  return require.resolve (id, {paths:[process.cwd(), __dirname]})
+function _local (id, _else) {
+  try { return require.resolve (id, {paths:[process.cwd(), __dirname]}) }
+  catch(e) {
+    if (_else) return _else(e)
+    else throw e
+  }
 }
 
 function _defaultCompile (argv, _force) {
@@ -80,7 +84,7 @@ function _defaultCompile (argv, _force) {
 
 function _is_model (argv) {
   // IMPORTANT: have a separate env here, so that the normal one is not initialized before `cds_cli.args` above
-  const env = require (_local('@sap/cds/lib/env')).for('cds')
+  const env = require (_local('@sap/cds/lib/env/cds-env', ()=>_local('@sap/cds/lib/env'))).for('cds')
   const cds = require (_local('@sap/cds'))
   return !!cds.resolve(argv,{env,cache:{}})
 }

package/bin/deploy/index.js

@@ -1,5 +1,5 @@
 module.exports = Object.assign(deploy, {
-  options: ['--to', '--tunnel-address'],
+  options: ['--to', '--tunnel-address', '--vcap-file'],
   flags: [ '--no-save', '--auto-undeploy', '--dry', '--with-mocks', '--store-credentials', '--bind' ],
   shortcuts: ['-2'],
   help: `
@@ -42,6 +42,12 @@ module.exports = Object.assign(deploy, {
       Deploy through the given address (host:port) rather than the original
       database address.  The tunnel must have been opened before, e.g. using 'cf ssh'.
 
+    *--vcap-file* (beta feature)
+
+      Use credentials from the given file when deploying to *SAP HANA*, instead of
+      creating new credentials. File must be in *default-env.json* format, with a root
+      node *VCAP_SERVICES*.
+
     *--store-credentials* (only in combination with *--to hana*)
 
       Stores credentials in *default-env.json file*. This is the former default behavior

package/lib/bind/bindingResolver.js

@@ -1,11 +1,10 @@
-const Config = require('@sap/cds/lib/env')
 const cds = require('../cds')
 const LOG = cds.log('bind');
 const resolveBinding = resolver(LOG);
 const { platformText, bindingText } = require('./bindingUtil');
 
 function getUnresolvedBindings({cwd = process.cwd(), env}) {
-    if (!env) env = Config.for('cds', cwd)
+    if (!env) env = cds.env.for('cds', cwd)
     if (feature(env) === false || feature(env) === "false") return {}
 
     const bindings = {}

package/lib/bind/cfKeyProvider.js

@@ -89,13 +89,13 @@ class CFKeyProvider {
 
 
         const { org, space } = target;
-        const orgs = await this._req(targetWithAuth, `/v3/organizations?names=${org}`);
+        const orgs = await this._req(targetWithAuth, `/v3/organizations?names=${encodeURIComponent(encodeURIComponent(org))}`);
         if (!(orgs && orgs.resources.length === 1)) {
             throw new Error(`CF org ${org} not found!`);
         }
 
         const orgGuid = orgs.resources[0].guid;
-        const spaces = await this._req(targetWithAuth, `/v3/spaces?names=${space}&organization_guids=${orgGuid}`)
+        const spaces = await this._req(targetWithAuth, `/v3/spaces?names=${encodeURIComponent(encodeURIComponent(space))}&organization_guids=${encodeURIComponent(encodeURIComponent(orgGuid))}`)
         if (!(spaces && spaces.resources.length === 1)) {
             throw new Error(`CF space ${space} not found in org ${org}!`);
         }
@@ -243,7 +243,7 @@ class BatchRequest {
         }
 
         const params = Object.keys(filterParams).map(
-            name => `${name}=${filterParams[name].map(value => encodeURIComponent(value)).join(',')}`
+            name => `${name}=${encodeURIComponent(filterParams[name].map(value => encodeURIComponent(value)).join(','))}`
         ).join("&");
 
         const url = this.url + (this.url.match(/\?/) ? '&' : '?') + params;

package/lib/init/constants.js

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

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

@@ -7,6 +7,7 @@ const term = require('../../../util/term');
 const ProjectReader = require('../../util/projectReader');
 
 const TemplateBase = require('../templateBase');
+const versionCompare = require('../../util/versionCompare');
 
 const { PROJECT_TYPE, OPTION_JAVA, URLS, OPTION_HELM_UPDATE } = require('../../constants');
 const { nullLogger } = require('../../util/logger');
@@ -34,9 +35,8 @@ module.exports = class HanaTemplate extends TemplateBase {
     }
 
     async checkEnabled() {
-        const { lt } = require('semver')
         const cds = require('../../../cds')
-        if (lt(cds.version, '5.9.0')) {
+        if (versionCompare(cds.version, '5.9.0') < 0) {
             cds.error('The added configuration requires @sap/cds 5.9.0 or higher. Please update @sap/cds to the latest version and run \x1b[1mcds add hana\x1b[0m again.')
         }
         return true

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

@@ -8,7 +8,7 @@ const io = require("../../../lint/io");
 const readline = require("readline");
 
 const { OPTION_LINT_DEV, OPTION_LINT_GLOBAL } = require("../../constants");
-const { mkdirp, fs } = require("@sap/cds/lib/utils");
+const { mkdirp, fs } = require("@sap/cds").utils;
 const { getConfigPath, getFileExtensions } = require("@sap/eslint-plugin-cds/lib/api");
 const generators = require("../../../lint/generators");
 

package/lib/init/template/templateBase.js

@@ -1,5 +1,5 @@
+const cds = require('@sap/cds');
 const path = require('path');
-const Config = require('@sap/cds/lib/env');
 
 const TemplateUtil = require('../util/templateUtil');
 
@@ -59,7 +59,7 @@ module.exports = class TemplateBase {
             projectPath = this.cwd;
         }
 
-        return Config.for('cds', projectPath);
+        return cds.env.for('cds', projectPath);
     }
 
     /**

package/lib/init/util/projectReader.js

@@ -1,7 +1,7 @@
 const path = require('path')
 const { nullLogger } = require('../util/logger')
 const { BuildTaskFactory } = require('@sap/cds/bin/build')
-const { fs } = require('@sap/cds/lib/utils')
+const { fs } = require('@sap/cds').utils
 const P_LANGUAGE_JAVA = 'java'
 const P_LANGUAGE_NODEJS = 'nodejs'
 const DEFAULT_P_LANGUAGE = P_LANGUAGE_NODEJS

package/lib/k8s/connectivity/index.js

@@ -5,6 +5,12 @@ module.exports = wrapFeature('connectivity', {
         const model = await context.get('model');
         const prefix = model.app.name;
 
+        deployment.env = {
+            ...(deployment.env || {}),
+            CDS_ENVIRONMENT_K8S_SERVICEBINDINGS_CONNECTIVITY_SECRETSPATH: '/bindings/connectivity',
+            CDS_ENVIRONMENT_K8S_SERVICEBINDINGS_CONNECTIVITY_SERVICE: 'connectivity'
+        };
+
         deployment.additionalVolumes = deployment.additionalVolumes || [];
         deployment.additionalVolumes.push(
             {

package/lib/k8s/connectivity/templates/connectivity-proxy-info.yaml

@@ -1,8 +1,10 @@
-{{- $ := merge (dict "name" "connectivity-proxy-info") . }}
+{{- if .Values.connectivity }}
+  {{- if or (not (hasKey .Values.connectivity "enabled")) .Values.connectivity.enabled }}
+    {{- $ := merge (dict "name" "connectivity-proxy-info") . }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Release.Name }}-connectivity-proxy-info
+  name: {{ .Values.connectivity.configMapName }}
   namespace: {{ .Release.Namespace }}
   labels: {{- include "cap.labels" $ | nindent 4 }}
 data:
@@ -13,4 +15,6 @@ data:
   onpremise_proxy_ldap_port: "20001"
   onpremise_proxy_port: "20003"
   onpremise_proxy_rfc_port: "20001"
-  onpremise_socks5_proxy_port: "20004"
+  onpremise_socks5_proxy_port: "20004"
+  {{- end }}
+{{- end }}

package/lib/k8s/xsuaa/lib.js

@@ -1,12 +1,15 @@
-const { exec } = require("../../util/exec");
+const cds = require('../../compile')
+const Path = require('path');
 
 async function renderXsSecurityJson(projectPath) {
-  const result = await exec({
-    cwd: projectPath,
-    stdio: ["inherit", "pipe", "inherit"],
-  })`cds compile srv -2 xsuaa`;
-  const xsSecurityJson = result.stdout;
-  return xsSecurityJson;
+  const xsSecurityJson = 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 }
+
+  return JSON.stringify(xsSecurityJson, null, 2);
 }
 
 module.exports = {

package/lib/lint/generators.js

@@ -2,7 +2,7 @@ const fs = require("fs");
 const os = require("os");
 const cp = require("child_process");
 const path = require("path");
-const { mkdirp } = require("@sap/cds/lib/utils");
+const { mkdirp } = require("@sap/cds").utils;
 const term = require("../util/term");
 
 const IS_WIN = os.platform() === "win32";