@sap/cds-dk 8.7.3 → 8.8.1

package/lib/bind/index.js

@@ -1,127 +0,0 @@
-const cds = require('../cds');
-
-const BindingResolver = require('./bindingResolver');
-const { determineKinds, getRequiresNameFromKind, checkIsJavaProject, platformText, bindingText, logger } = require('./bindingUtil');
-const { bold } = require('../util/term');
-
-
-module.exports = { bind, storeBindings, parseProfile, mergeCredentials }
-
-/**
- * Executes cds build in the directory defined by cds.root.
- *
- * @param {object} options - command options as defined by build command.
- */
-async function bind(options) {
-    let on;
-    switch (options.on) {
-        case 'k8s':
-        case 'kubernetes':
-            on = 'k8s';
-            break;
-        case undefined:
-        case null:
-        case 'cf':
-        case 'cloudfoundry':
-            on = 'cf';
-            break;
-        default:
-            throw `Invalid value '${options.on}' for option --on.`;
-    }
-
-    const onText = { 'cf': 'Cloud Foundry', 'k8s': 'Kubernetes' }[on];
-    if (!options['to-app-services']) logger.log(`Retrieving data from ${bold(onText)}...`);
-
-    // run in parallel
-    const targets = options.to.split(/,/g);
-    const resolvedServices = await Promise.all(targets.map(async target => {
-        let binding;
-        if (on === 'k8s') {
-            binding = { type: on, name: target };
-        } else if (on === 'cf') {
-            const [instance, key] = target.split(/:/);
-            binding = { type: on, instance, key };
-        } else {
-            throw new Error('Internal Error');
-        }
-        const resolvedService = await BindingResolver.resolveBinding(undefined, binding);
-        resolvedService._target = target;
-        delete resolvedService.credentials;
-        resolvedService.binding.resolved = false;
-        return resolvedService;
-    }));
-
-    if (options.kind) {
-        resolvedServices.forEach(service => service.kind = options.kind);
-    } else {
-        determineKinds(resolvedServices);
-    }
-
-    for (const resolvedService of resolvedServices) {
-        if (options.serviceArg) {
-            resolvedService.name = options.serviceArg;
-        } else if (resolvedService.kind) {
-            resolvedService.name = getRequiresNameFromKind(resolvedService.binding.instance, resolvedService.kind);
-        }
-
-        let { kind, name, binding } = resolvedService;
-        name = name ?? `custom-service:${binding.instance || binding.secret}`
-        resolvedService.name = resolvedService.name ?? name
-        const kindText = kind ? ` with kind ${bold(kind)}` : ''
-        const nameText = bold(name)
-
-        logger.log(`Binding ${nameText} to ${platformText(binding)} ${bindingText(binding)}${kindText}`);
-    }
-
-    return resolvedServices;
-}
-
-async function storeBindings(resolvedServices, options) {
-    // prepare for different providers
-    const userCdsrcJsonStorageProvider = require('./userCdsrcJsonStorageProvider');
-
-    await userCdsrcJsonStorageProvider.storeServices(resolvedServices, {
-        ...options
-    });
-
-    const isJavaProject = await checkIsJavaProject(cds.root);
-    if (!cds.cli.options['to-app-services']) {
-        logger.log(`\nTo run with cloud bindings use ${bold(runCmd(options.for, isJavaProject))}`);
-    }
-}
-
-function runCmd(profile, isJavaProject) {
-    profile = parseProfile(profile);
-    if (isJavaProject) {
-        const p = profile === 'hybrid' ? '' : ` --profile ${profile}`;
-        return `cds bind --exec${p} mvn spring-boot:run`;
-    } else {
-        const p = profile === 'development' ? '' : ` --profile ${profile}`;
-        return `cds watch${p}`;
-    }
-}
-
-function parseProfile(profile) {
-    if (!profile) return 'hybrid';
-    else if (profile === '-') return 'development';
-    else return profile;
-}
-
-function mergeCredentials(credentials, customCredentials) {
-    if (!customCredentials) return credentials;
-
-    for (const key in customCredentials) {
-        if (typeof customCredentials[key] === 'object') {
-            if (credentials[key] && typeof credentials[key] !== 'object') {
-                throw `Cannot merge credentials: '${key}' is not an object`;
-            }
-            if (!credentials[key]) {
-                credentials[key] = {};
-            }
-            credentials[key] = mergeCredentials(credentials[key], customCredentials[key]);
-        } else {
-            credentials[key] = customCredentials[key];
-        }
-    }
-    return credentials;
-}

package/lib/bind/kubernetesCredentialsProvider.js

@@ -1,84 +0,0 @@
-const KubernetesApiAccessor = require('./KubernetesApiAccessor');
-const { mergeCredentials } = require('./index');
-
-class KubernetesCredentialsProvider {
-    async init() {
-        this.api = new KubernetesApiAccessor();
-    }
-
-    async resolve(name, binding) {
-        if (!this.initPromise) {
-            this.initPromise = this.init();
-        }
-        await this.initPromise;
-
-
-        const { context, namespace, cluster } = await this.api.context({ cluster: binding.cluster, namespace: binding.namespace });
-        let { name: bindingName, secret, credentials: customCredentials } = binding;
-
-        let instance;
-        let secretOrBindingResource = 'Secret';
-
-        if (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 {
-                const { spec } = bindingResource
-                if (!spec.secretName || !spec.serviceInstanceName) {
-                    throw new Error('Internal error')
-                }
-                secret = spec.secretName;
-                instance = spec.serviceInstanceName;
-            }
-        }
-
-        const secretResource = await this.api.get({ context, namespace, kind: 'secrets', name: secret });
-        if (secretResource === null) throw new Error(`${secretOrBindingResource} '${secret}' not found.`);
-
-        const serviceBinding = this._readBinding(name, secretResource);
-        const { credentials } = serviceBinding;
-        const vcap = { ...serviceBinding, credentials: undefined }
-
-        const resolvedBinding = {
-            binding: {
-                type: 'k8s',
-                name: bindingName,
-                cluster,
-                instance,
-                namespace,
-                secret: secret,
-                resolved: true,
-                vcap
-            },
-            credentials: mergeCredentials(credentials, customCredentials)
-        };
-
-        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;
-        }
-
-        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`)
-
-        return parseBinding('/', name, properties);
-    }
-}
-
-module.exports = new KubernetesCredentialsProvider();

package/lib/bind/userCdsrcJsonStorageProvider.js

@@ -1,92 +0,0 @@
-const os = require('os');
-const path = require('path');
-
-const fs = require('fs').promises;
-const { bold } = require('../util/term');
-const { logger } = require('./bindingUtil');
-
-const gitUtil = require('../util/git');
-
-const CDSRC_FILENAME = '.cdsrc-private.json';
-
-class UserCdsrcJsonStorageProvider {
-
-    async storeServices(services, options = {}) {
-        let jsonPath = options.out || CDSRC_FILENAME;
-
-        if (jsonPath === CDSRC_FILENAME) {
-            await gitUtil.ensureFileIsGitignored(CDSRC_FILENAME);
-        }
-
-        jsonPath = jsonPath.replace(/~/g, os.homedir());
-        if (path.extname(jsonPath) !== '.json') {
-            jsonPath = path.join(jsonPath, '.cdsrc.json');
-        }
-
-        const jsonObject = await this.readJsonSafely(jsonPath);
-        let cdsRoot;
-        if (path.basename(jsonPath) === 'package.json') {
-            jsonObject.cds = jsonObject.cds || {};
-            cdsRoot = jsonObject.cds;
-        } else {
-            cdsRoot = jsonObject;
-        }
-
-        const profileKey = `[${options.for}]`;
-        const features = cdsRoot.features && cdsRoot.features[profileKey];
-        if (features) delete features.emulate_vcap_services;
-
-        cdsRoot.requires = cdsRoot.requires || {};
-        let section;
-        section = cdsRoot.requires[profileKey] = cdsRoot.requires[profileKey] || {};
-
-        for (const service of services) {
-            const { name, kind, binding, credentials } = service;
-            const requireService = section[name] = section[name] || {};
-            // store optional custom credentials
-            binding.credentials = this._getServiceCredentials(binding, services, options);
-
-            Object.assign(requireService, { binding: { ...binding, vcap: undefined }, credentials, kind, vcap: { name } });
-        }
-
-        await this.writeJsonFile(jsonPath, jsonObject);
-        logger.log(`Saving bindings to ${bold(jsonPath)} in profile ${bold(options.for)}`);
-    }
-
-    async readJsonSafely(filePath) {
-        try {
-            return JSON.parse(await fs.readFile(filePath));
-        } catch (err) {
-            return {};
-        }
-    }
-
-    async writeJsonFile(filePath, content) {
-        await fs.mkdir(path.dirname(filePath), { recursive: true })
-        await fs.writeFile(filePath, JSON.stringify(content, null, 2));
-        await fs.chmod(filePath, 0o600); // -rw-------
-    }
-
-    _getServiceCredentials(binding, services, options) {
-        const { to, 'to-app-services': app, credentials } = options;
-        if (!credentials) {
-            return
-        }
-        // toService has format <service-name>[:<key>]
-        const toServices = to ? to.split(',') : services.map(s => s.binding.instance);
-        const toService = toServices.find(toService => binding.type === 'cf' ?
-            toService === binding.instance || toService === binding.instance + ':' + binding.key :
-            toService === binding.secret);
-        if (!toService) {
-            // must never happen
-            throw new Error(`Internal error: Service ${binding.instance}:${binding.key} not found`);
-        }
-        // app based binding always requires service name as key in credentials
-        if (!app && toServices.length === 1) {
-            return credentials[toService] || credentials;
-        }
-        return credentials[toService];
-    }
-}
-
-module.exports = new UserCdsrcJsonStorageProvider();

package/lib/init/template/destination/files/package.sidecar.json

@@ -1,7 +0,0 @@
-{
-  "cds": {
-    "requires": {
-      "destinations": true
-    }
-  }
-}

package/lib/init/template/html5-repo/files/package.sidecar.json

@@ -1,7 +0,0 @@
-{
-  "cds": {
-    "requires": {
-      "html5-repo": true
-    }
-  }
-}

package/lib/init/template/telemetry/files/package.json.hbs

@@ -1,18 +0,0 @@
-{
-  "dependencies": {
-    "@cap-js/telemetry": ">=0",
-    "@grpc/grpc-js": "^1",
-    "@opentelemetry/exporter-trace-otlp-grpc": "^0",
-    "@opentelemetry/exporter-metrics-otlp-grpc": "^0",
-    "@opentelemetry/host-metrics": "^0"
-  },
-  "cds": {
-    "requires": {
-      "[{{profile}}]": {
-        "telemetry": {
-          "kind": "to-cloud-logging"
-        }
-      }
-    }
-  }
-}