@sap/cds-dk 8.2.2 → 8.3.0

package/lib/import/common.js

@@ -17,7 +17,7 @@ let optionsMapping = {
 };
 
 let apiOptions = ['includeNamespaces', 'keepNamespace', 'beta'];
-let commonOptions = ['no_copy', 'no_save', 'out', 'dry', 'as', 'from', 'force', 'config', 'destination'];
+let commonOptions = ['no_copy', 'no_save', 'out', 'dry', 'as', 'from', 'force', 'config', 'destination', 'name'];
 
 async function generateEDMX2JSON(edmx) {
     let cjson = convert.xml2json(edmx, {
@@ -176,7 +176,7 @@ async function processOptions(cliOptions, options) {
             options[item] = cliOptions[item];
         }
     });
-    
+
     // reads cli options from environment
     readEnvVariables(cliOptions, true);
 }
@@ -312,10 +312,10 @@ async function _write(result, service, cwd) {
     extension = dest.substring(dest.lastIndexOf('.'));
     dest = dest.replace(extension, '');
      if (service.length > 1){
-        using = `using { ${service.join(', ')}} from './${path.relative('srv', dest).replace(/\\/g, '/')}'`;
+        using = `using { ${service.join(', ')}} from './${path.relative(cds.env.folders.srv, dest).replace(/\\/g, '/')}'`;
      }
      else{
-        using = `using { ${service} as external } from './${path.relative('srv', dest).replace(/\\/g, '/')}'`;
+        using = `using { ${service} as external } from './${path.relative(cds.env.folders.srv, dest).replace(/\\/g, '/')}'`;
      }
     using = require('../util/term').info(using);
     message = `[cds] - imported API to ${path.relative(cwd, dest)}
@@ -327,21 +327,36 @@ ${using}
     console.log(message);
 }
 
-async function _updatePackageJson(dest, services, kind, cwd, config) {
-    const package_json = path.resolve(cwd, 'package.json');
-    const conf = await exists(package_json) ? require(package_json) : {};
+async function _updatePackageJson(dest, services, kind, cwd, config, destination) {
+    // try to find package.json in the srv folder
+    let package_json = _findPackageJson(path.resolve(cwd, dest), cwd);
+    let conf = {};
+    if (package_json) {
+        conf = JSON.parse(await read(package_json, "utf-8"));
+    } else {
+        package_json = path.resolve(cwd, 'package.json');
+    }
     const requires = ['cds', 'requires'].reduce((p, n) => p[n] || (p[n] = {}), conf);
     if (kind !== 'rest' && kind !== 'rfc') {
         kind = (kind === "V2") ? 'odata-v2' : 'odata';
     }
+    // add destination configuration
+    if (!config && destination) {
+        config = { "[production]": { credentials: { destination } } };
+    }
+    
     let package_json_updated = false;
     for (let service of services) {
         // existing service configuration data can be updated, e.g. in case of delta imports
         const model = path.relative(cwd, dest).replace(/\\/g, '/'); // cds env must not be platform specific
         const serviceConfig = { kind, model, ...config }
-        if (!requires[service] || JSON.stringify(serviceConfig) !== JSON.stringify(requires[service])) {
+        if (!requires[service]) {
             cds.env.requires[service] = requires[service] = serviceConfig;
             package_json_updated = true;
+        } else {
+            if (JSON.stringify(serviceConfig) !== JSON.stringify(requires[service])) {
+                console.warn(`Service '${service}' already exists in ./package.json with a different configuration, skipping update.\n`);
+            }
         }
     }
     if (package_json_updated) {
@@ -350,6 +365,21 @@ async function _updatePackageJson(dest, services, kind, cwd, config) {
     }
 }
 
+function _findPackageJson(dir, cwd) {
+    const packageJsonPath = path.join(dir, 'package.json');
+    if (fs.existsSync(packageJsonPath)) {
+        return packageJsonPath;
+    }
+    if (dir === cwd) {
+        return null;
+    }
+    const parentDir = path.dirname(dir);
+    if (parentDir === dir) {
+        return null;
+    }
+    return _findPackageJson(parentDir, cwd);
+}
+
 function _parseValidJsonConfig(config) {
     try {
         if (config) {
@@ -363,19 +393,12 @@ function _parseValidJsonConfig(config) {
 async function postProcess(filePath, options, csn, cwd) {
     const services = _getServiceNames(csn);
     let config = _parseValidJsonConfig(options.config);
-    
-    // add destination configuration
-    if (options.destination) {
-        config ??= {};
-        config.credentials = { destination: options.destination };
-    }
-
-    const destFilePath = path.resolve(cwd, options.out ? path.join(options.out, path.basename(filePath)) : path.join('srv/external/', path.basename(filePath)));
+    const destFilePath = path.resolve(cwd, options.out ? path.join(options.out, path.basename(filePath)) : path.join(cds.env.folders.srv, 'external', path.basename(filePath)));
     if (options.out) options.out = _validateAndComputeOutputFilePath(options.out, options.as, destFilePath);
     const kind = options.inputFileKind;
     const result = await _getResult(csn, options.as, options.out || destFilePath.replace(/\.[^.]+$/, ''), options.force, kind);
     const written = options.dry || await _write(result, services, cwd);
-    const registered = options.dry || options.no_save || await _updatePackageJson(result[1].replace(/\.[^.]+$/, ''), services, kind, cwd, config);
+    const registered = options.dry || options.no_save || await _updatePackageJson(result[1].replace(/\.[^.]+$/, ''), services, kind, cwd, config, options.destination);
     if (!options.dry && !options.no_copy)
         await _copyToSrvExternal(filePath, destFilePath, cwd);
     if (options.dry) return console.log(result[0]);

package/lib/import/importapi.js

@@ -7,11 +7,11 @@ let asyncapi = require('./asyncapi');
 let messages = require('./message').getMessages();
 
 module.exports = Object.assign(cds_import, {
-    from: cds.lazified({
+    from: {
         edmx: cds_import_from_edmx,
         openapi: cds_import_from_openapi,
         asyncapi: cds_import_from_asyncapi
-    })
+    }
 });
 
 /**
@@ -95,7 +95,7 @@ async function cds_import_from_openapi(filepath, options = {}) {
     return csn;
 }
 
-/** 
+/**
  * This is the import API function to generate CSN from asyncapi files.
  * @param {string} filepath
  * - a single valid filepath

package/lib/import/openapi/importOpenAPI.js

@@ -552,14 +552,13 @@ function indirectlyReferencedType(context, subSchema) {
 }
 
 function referencedType(context, ref) {
-    const expectedPrefix = context.v3
-        ? "#/components/schemas/"
-        : "#/definitions/";
+    const expectedPrefix = context.v3 ? "#/components/schemas/" : "#/definitions/";
     if (!ref.startsWith(expectedPrefix)) {
         throw new Error(`TODO: unexpected reference ${ref} in schema.`);
     }
     const schemaName = ref.substring(expectedPrefix.length);
     const schema = context.schemas[schemaName];
+
     return {
         name: `${context.serviceName}_types.${cdsName(schemaName)}`,
         schema,
@@ -633,11 +632,50 @@ function betterType(currentType, schema) {
 // }
 
 function structElements(context, type, schema) {
+    checkCircularReference(schema);
+    const schemaName = Object.keys(context.schemas).find(key => context.schemas[key] === schema);
+    const refPath = `#/components/schemas/${schemaName}`;
     //TODO: interpret "required"
     for (const [prop, propSchema] of Object.entries(schema.properties || {})) {
         const name = cdsName(prop);
+        //to detect recursive data types
+        if ((propSchema?.$ref === refPath) || (propSchema?.items?.$ref === refPath)) {
+            console.warn(`Recursive data type detected: ${schemaName} for the property ${name}`);
+        }
         //TODO: check if property "name" already exists and has identical cdsType, warn otherwise
         type.elements[name] = cdsType(context, propSchema);
         if (name !== prop) type.elements[name]["@openapi.name"] = prop;
     }
-}
+}
+
+// function to check circular references and throw error if found
+function checkCircularReference(schema, visited = new Set()) {
+    if (schema.$ref) {
+        const ref = schema.$ref;
+        if (visited.has(ref)) {
+            console.warn(`Circular reference detected: ${ref}`);
+        }
+        visited.add(ref);
+    }
+    
+    if (schema.allOf) {
+        schema.allOf.forEach(subSchema => checkCircularReference(subSchema, visited));
+    }
+    
+    if (schema.anyOf) {
+        schema.anyOf.forEach(subSchema => checkCircularReference(subSchema, visited));
+    }
+    
+    if (schema.oneOf) {
+        schema.oneOf.forEach(subSchema => checkCircularReference(subSchema, visited));
+    }
+    
+    if (schema.properties) {
+        Object.values(schema.properties).forEach(subSchema => checkCircularReference(subSchema, visited));
+    }
+    
+    if (schema.items) {
+        checkCircularReference(schema.items, visited);
+    }
+}
+

package/lib/init/merge.js

@@ -162,8 +162,8 @@ async function _mergeYAML(into, from, project, semantics = {}) {
 
     let collectionStack = [target.contents]
 
-    const _getProperty = (object, keyPath) => keyPath.split('.').reduce((p, k) => p && p[k], object)
-    const _getYAMLProperty = (object, keyPath) => keyPath.split('.').reduce((p, k) => p && p.get(k), object)
+    const _getProperty = (object, keyPath) => keyPath.split('.').filter(k => k).reduce((p, k) => p && p[k], object)
+    const _getYAMLProperty = (object, keyPath) => keyPath.split('.').filter(k => k).reduce((p, k) => p && p.get(k), object)
 
     const _validateWhere = (node, dict, index) => {
         const _addToMap = entries => entries?.filter(entry => {

package/lib/init/mvn.js

@@ -17,8 +17,8 @@ module.exports.add = async function (feature) {
     if (javaMvn) _scan(javaMvn).forEach(([k,v]) => params.set(k,v))
     const archetypeVersion = params.get('-DarchetypeVersion') ?? MAVEN_ARCHETYPE_VERSION
     if (feature === HANA) { // REVISIT: compat for HANA until -Dfeature HANA is provided by Java
-        params.set(`com.sap.cds:cds-maven-plugin:${archetypeVersion}:addTargetPlatform`)
-        params.set(`-DtargetPlatform`, `cloudfoundry`) // REVISIT: Should get rid of CF dependency for Kyma scenarios
+        params.set(`com.sap.cds:cds-maven-plugin:${archetypeVersion}:add`)
+        params.set(`-Dfeature`, `CF`) // REVISIT: Should get rid of CF dependency for Kyma scenarios
     } else {
         params.set(`com.sap.cds:cds-maven-plugin:${archetypeVersion}:add`)
         params.set(`-Dfeature`, feature)

package/lib/init/projectReader.js

@@ -13,7 +13,7 @@ module.exports = new class ProjectReader {
 
     #setPackageInfo() {
         // 1. Use project name and static default values
-        this.appVersion = cds.cli.options.add?.has('java') ? '1.0.0-SNAPSHOT' : '1.0.0'
+        this.appVersion = cds.cli.options?.add?.has('java') ? '1.0.0-SNAPSHOT' : '1.0.0'
         this.appName = this.appId = basename(cds.root)
         this.appDescription = 'A simple CAP project.'
 
@@ -89,10 +89,12 @@ module.exports = new class ProjectReader {
      * @property {boolean} hasApprouter Indicates if the project uses the SAP Application Router.
      * @property {boolean} hasHtml5Repo Indicates if the project uses the SAP BTP HTML5 Application Repository.
      * @property {boolean} hasPortal Indicates if the project uses the SAP Cloud Portal service.
+     * @property {boolean} hasWorkzone Indicates if the project uses the SAP Build Work Zone service.
      * @property {boolean} hasDestination Indicates if the project uses the SAP BTP Destination service.
      * @property {boolean} hasMTXRoute Indicates if the approuter should have a multitenant route.
      * @property {boolean} hasMTXRouteJava Indicates if the approuter should have a multitenant subscription route (java).
      * @property {boolean} hasMalwareScanner Indicates if the project uses the SAP Malware Scanning service.
+     * @property {boolean} hasDynatrace Indicates if the project uses Dynatrace.
      *
      */
 

package/lib/init/registries/xs-app.js

@@ -0,0 +1,10 @@
+
+
+const odataApi = {
+  in: 'routes',
+  where: { target: '/odata/$1' }
+}
+
+module.exports = {
+  odataApi
+}

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

@@ -3,6 +3,7 @@ const cds = require('../../../cds')
 const { exists } = require('../../../cds').utils
 const { readProject } = require('../../projectReader')
 const { renderAndCopy } = require('../../template')
+const mvn = require('../../mvn')
 const MANIFEST_FILE = 'manifest.yml'
 const SERVICES_MANIFEST_FILE = 'services-manifest.yml'
 
@@ -29,5 +30,6 @@ module.exports = class CfManifestTemplate extends require('../../plugin') {
     async run() {
         const project = readProject()
         await renderAndCopy(join(__dirname, 'files'), cds.root, project)
+        if (project.isJava) await mvn.add('CF')
     }
 }

package/lib/init/template/cloud-logging/files/mta.yaml.hbs

@@ -3,6 +3,17 @@ modules:
   - name: {{appName}}-srv
     type: {{language}}
     path: {{& srvPath}}
+    {{#isJava}}
+    properties:
+      JBP_CONFIG_JAVA_OPTS:
+        from_environment: false
+        java_opts: >
+          -javaagent:META-INF/.sap_java_buildpack/otel_agent/opentelemetry-javaagent.jar
+          -Dotel.javaagent.extensions=META-INF/.sap_java_buildpack/otel_agent_extension/otel-agent-ext-java.jar
+      OTEL_METRICS_EXPORTER: cloud-logging
+      OTEL_TRACES_EXPORTER: cloud-logging
+      OTEL_LOGS_EXPORTER: none
+    {{/isJava}}
     requires:
       - name: {{appName}}-cloud-logging
   - name: {{appName}}-mtx
@@ -21,5 +32,5 @@ resources:
       service: cloud-logging
       service-plan: {{cloudLoggingServicePlan}}
       config:
-      ingest_otlp:
-        enabled: true
+        ingest_otlp:
+          enabled: true

package/lib/init/template/cloud-logging/files/{package.json → package.json.hbs}

@@ -8,7 +8,11 @@
   },
   "cds": {
     "requires": {
-      "telemetry": "to-cloud-logging"
+      "[{{profile}}]": {
+        "telemetry": {
+          "kind": "to-cloud-logging"
+        }
+      }
     }
   }
 }

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

@@ -30,9 +30,10 @@ module.exports = class extends require('../../plugin') {
   }
 
   async run() {
-    const { hasTelemetry } = readProject()
-    if (cds.cli.options['with-telemetry'] || hasTelemetry) {
-      await merge(__dirname, 'files/package.json').into('package.json')
+    const project = readProject(), { hasTelemetry, isNodejs } = project
+    if (isNodejs && (cds.cli.options['with-telemetry'] || hasTelemetry)) {
+      project.profile ??= 'production'
+      await merge(__dirname, 'files/package.json.hbs').into('package.json', { with: project })
       await sort('package.json', 'dependencies')
     }
   }

package/lib/init/template/data/as-csv.js

@@ -39,6 +39,12 @@ module.exports = async (data={}, csn, { headerOnly=false, separator=',' }={}) =>
             }
             record.push(...Object.values(value))
           }
+          else if (element.is_struct) {
+            if (i === 0) {
+              header.push(...Object.keys(value).map(structField => name + '_' + structField))
+            }
+            record.push(...Object.values(value))
+          }
           else {
             if (i === 0)  header.push(name)
             if (Array.isArray(value)) { // `array of` / `many`

package/lib/init/template/data/as-json.js

@@ -121,9 +121,16 @@ function dataForField(element, entity, csn, record, data, parentEntity, depth, r
   else if (element.items?.type) // `array of` / `many` with simple type
     return [ dataForField(element.items, entity, csn, record, data, null, depth+1, referenceData) ]
 
+  if (element.is_struct) {
+    let struct = {}
+    for (const el of element.elements) {
+      struct[el.name] = dataForField(el, entity, csn, record, data, null, depth+1, referenceData)
+    }
+    return struct
+  }
+
   const type = element._type || element.type
   switch (type) {
-    case undefined: return
     case 'cds.Time':
       return '22:59:53'
 

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

@@ -67,7 +67,7 @@ module.exports = class DataTemplate extends require('../../plugin') {
       : getDefaultTargetFolder(env)
     dest = resolve(cds.root, dest)
 
-    let csn = await cds.load(cds.env.roots) // normal CSN
+    let csn = await cds.load([cds.env.roots, join(`${cds.env.folders.srv}`, `external`) ]) // normal CSN. Default paths and models imported with `cds import`
     // Skip of unused reuse entities like Language, Country, Currency
     csn = cds.minify(csn)
     csn = cds.reflect(csn) // reflected model (adds additional helper functions)

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

@@ -31,14 +31,14 @@ resources:
             destinations:
               - Name: {{appName}}-srv-api
                 URL: ~{srv-api/srv-url}
-                Authentication: OAuth2UserTokenExchange
+                Authentication: NoAuthentication
                 Type: HTTP
                 ProxyType: Internet
                 HTML5.ForwardAuthToken: true
                 HTML5.DynamicDestination: true
-              - Authentication: NoAuthentication
-                Name: ui5
-                ProxyType: Internet
-                Type: HTTP
+              - Name: ui5
                 URL: https://ui5.sap.com
+                Authentication: NoAuthentication
+                Type: HTTP
+                ProxyType: Internet
         {{/hasHtml5Repo}}

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

@@ -3,8 +3,28 @@ modules:
   - name: {{appName}}-srv
     type: {{language}}
     path: {{& srvPath}}
+    {{#isJava}}
+    properties:
+      JBP_CONFIG_JAVA_OPTS:
+        from_environment: false
+        java_opts: >
+          -javaagent:META-INF/.sap_java_buildpack/otel_agent/opentelemetry-javaagent.jar
+          -Dotel.javaagent.extensions=META-INF/.sap_java_buildpack/otel_agent_extension/otel-agent-ext-java.jar
+          -Dotel.javaagent.extension.sap.cf.binding.dynatrace.metrics.token-name=ingest_apitoken
+      OTEL_METRICS_EXPORTER: dynatrace
+      OTEL_TRACES_EXPORTER: none
+      OTEL_LOGS_EXPORTER: none
+    {{/isJava}}
     requires:
       - name: {{appName}}-dynatrace
+        parameters:
+          config:
+            tokens:
+              - name: ingest_apitoken
+                scopes:
+                  - openTelemetryTrace.ingest
+                  - metrics.ingest
+
   - name: {{appName}}-mtx
     type: nodejs
     path: {{#isNodejs}}gen/{{/isNodejs}}mtx/sidecar
@@ -15,10 +35,6 @@ resources:
     type: org.cloudfoundry.managed-service
     parameters:
       service: dynatrace
-      service-plan: standard
+      service-plan: environment
       config:
-        tokens:
-          - name: ingest_apitoken
-            scopes:
-              - openTelemetryTrace.ingest
-              - metrics.ingest
+        environment_name: {{appName}}

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

@@ -2,13 +2,16 @@
   "dependencies": {
     "@cap-js/telemetry": ">=0",
     "@opentelemetry/exporter-metrics-otlp-proto": "^0"{{#hasHelm}},
-    "@opentelemetry/exporter-trace-otlp-proto": "^0",
     "@opentelemetry/host-metrics": "^0"
     {{/hasHelm}}
   },
   "cds": {
     "requires": {
-      "telemetry": "to-dynatrace"
+      "[{{profile}}]": {
+        "telemetry": {
+          "kind": "to-dynatrace"
+        }
+      }
     }
   }
 }

package/lib/init/template/dynatrace/files/values.yaml

@@ -0,0 +1,15 @@
+srv:
+  bindings:
+    dynatrace:
+      serviceInstanceName: dynatrace
+      parameters:
+        tokens:
+          - name: ingest_apitoken
+            scopes:
+              - openTelemetryTrace.ingest
+              - metrics.ingest
+dynatrace:
+  serviceOfferingName: dynatrace
+  servicePlanName: environment
+  parameters:
+    environment_name: DYNATRACE # (Mandatory) maximum of 16 characters and can only comprise of uppercase letters and digits.

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

@@ -10,20 +10,21 @@ module.exports = class extends require('../../plugin') {
   }
 
   async canRun() {
-    const { hasMta, hasHelm, hasHelmUnifiedRuntime } = readProject()
-    if ((hasHelmUnifiedRuntime || hasHelm) && !hasMta) throw `'cds add dynatrace' is not available for Kyma yet`
     return true
   }
 
   async run() {
     const project = readProject()
-    await merge(__dirname, 'files/package.json.hbs').into('package.json', { with: project })
-    await sort('package.json', 'dependencies')
+    if (project.isNodejs) {
+      project.profile ??= 'production'
+      await merge(__dirname, 'files/package.json.hbs').into('package.json', { with: project })
+      await sort('package.json', 'dependencies')
+    }
   }
 
   async combine() {
     const project = readProject()
-    const { hasMta, isJava, hasMultitenancy, srvPath } = project
+    const { hasMta, hasHelm, hasHelmUnifiedRuntime, isJava, hasMultitenancy, srvPath } = project
 
     if (hasMta) {
       const dynatrace = {
@@ -51,5 +52,9 @@ module.exports = class extends require('../../plugin') {
         with: project, additions, relationships
       })
     }
+
+    if (hasHelm || hasHelmUnifiedRuntime) {
+      await merge(__dirname, 'files', 'values.yaml').into('chart/values.yaml')
+    }
   }
 }

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

@@ -5,7 +5,22 @@ const mvn = require('../../mvn')
 module.exports = class Handler extends require('../../plugin') {
 
   static help() {
-    return 'add handler stubs' 
+    return 'add handler stubs for actions and functions (Java)' 
+  }
+
+  options() {
+    return {
+      'filter': {
+        type: 'string',
+        short: 'f',
+        help: `Filter actions or functions by name prefix. Regular expressions are not supported.`
+      },
+      'out': {
+        type: 'string',
+        short: 'o',
+        help: 'Specify a custom output directory inside the `handlers` directory. The default is `handlers`.'
+      }
+    }
   }
 
   canRun() {

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

@@ -26,6 +26,6 @@ srv:
       memory: {{#isJava}}1G{{/isJava}}{{^isJava}}500M{{/isJava}}
   health:
     liveness:
-      path: {{#isJava}}/actuator/health{{/isJava}}{{^isJava}}/health{{/isJava}}
+      path: {{#isJava}}/actuator/health/liveness{{/isJava}}{{^isJava}}/health{{/isJava}}
     readiness:
-      path: {{#isJava}}/actuator/health{{/isJava}}{{^isJava}}/health{{/isJava}}
+      path: {{#isJava}}/actuator/health/readiness{{/isJava}}{{^isJava}}/health{{/isJava}}

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

@@ -5,6 +5,7 @@ const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { ask4 } = require('../../../util/question')
 const { execSync } = require('child_process')
+const { mvn } = require('../../add')
 
 module.exports = class HelmTemplate extends require('../../plugin') {
 
@@ -90,10 +91,11 @@ module.exports = class HelmTemplate extends require('../../plugin') {
         await merge(__dirname, 'files/Chart.yaml.hbs').into('chart/Chart.yaml', { with: project })
         await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
         await this._mergeDependency('web-application', 'srv')
+        if (project.isJava) await mvn.add('k8s')
     }
 
     async combine() {
-        const { hasDestination, hasEnterpriseMessaging, hasEnterpriseMessagingShared, hasHana, hasMultitenancy, hasXsuaa, hasHtml5Repo, hasApprouter, hasKafka, hasAttachments, hasPortal, hasMalwareScanner } = readProject()
+        const { hasDestination, hasEnterpriseMessaging, hasEnterpriseMessagingShared, hasHana, hasMultitenancy, hasXsuaa, hasHtml5Repo, hasApprouter, hasKafka, hasAttachments, hasPortal, hasMalwareScanner, hasDynatrace } = readProject()
 
         if (hasApprouter) {
             await this._mergeDependency('web-application', 'approuter')
@@ -140,6 +142,9 @@ module.exports = class HelmTemplate extends require('../../plugin') {
         if (hasMalwareScanner) {
             await this._mergeDependency('service-instance', 'malware-scanner')
         }
+        if (hasDynatrace) {
+            await this._mergeDependency('service-instance', 'dynatrace')
+        }
     }
 
     async _mergeDependency(name, alias) {

package/lib/init/template/html5-repo/files/app-package.json.hbs

@@ -8,11 +8,13 @@
     "start": "ui5 serve"
   },
   "devDependencies": {
-    "@ui5/cli": "^3",
+    {{#hasWorkzone}}"@sap/ui5-builder-webide-extension": "^1.1.9",{{/hasWorkzone}}
+    "@ui5/cli": "^4",
     "ui5-task-zipper": "^3"
   },
   "ui5": {
     "dependencies": [
+      {{#hasWorkzone}}"@sap/ui5-builder-webide-extension",{{/hasWorkzone}}
       "ui5-task-zipper"
     ]
   }

package/lib/init/template/html5-repo/files/ui5-deploy.yaml.hbs

@@ -13,6 +13,13 @@ builder:
       - "/test/**"
       - "/localService/**"
   customTasks:
+    {{#hasWorkzone}}
+    - name: webide-extension-task-updateManifestJson
+      afterTask: replaceVersion
+      configuration:
+        appFolder: webapp
+        destDir: dist
+    {{/hasWorkzone}}
     - name: ui5-task-zipper
       afterTask: generateVersionInfo
       configuration:

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

@@ -2,6 +2,7 @@ const { join } = require('path')
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, html5RepoHost, html5Runtime, appDeployer, approuter, mtxSidecar4 } = require('../../registries/mta')
+const { odataApi } = require('../../registries/xs-app')
 
 module.exports = class Html5RepoTemplate extends require('../../plugin') {
 
@@ -52,7 +53,8 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
 
         await Promise.all(apps.map(async ({app}) => {
             project.app = app
-            await merge(__dirname, 'files/xs-app.json.hbs').into(join(appPath, app, 'xs-app.json'), { project })
+            const additions = [odataApi]
+            await merge(__dirname, 'files/xs-app.json.hbs').into(join(appPath, app, 'xs-app.json'), { with: project, additions })
         }))
 
         if (hasMultitenancy) {

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

@@ -29,7 +29,7 @@ modules:
     parameters:
       buildpack: sap_java_buildpack_jakarta
       readiness-health-check-type: http
-      readiness-health-check-http-endpoint: /actuator/health
+      readiness-health-check-http-endpoint: /actuator/health/readiness
     properties:
       SPRING_PROFILES_ACTIVE: cloud,sandbox
       JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SAPMachineJRE']"