@sap/cds-dk 6.5.2 → 6.6.1

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

@@ -1,16 +1,12 @@
 const { join } = require('path')
-const ProjectReader = require('../../util/projectReader')
+const { readProject } = require('../../util/projectReader')
 const { mergeYAML } = require('../../util/merge')
-const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5Tracking')
+const { parseMd5File, writeMd5File } = require('../../util/md5Tracking')
 
 module.exports = class DestinationsTemplate extends require('../templateBase') {
-    constructor(projectPath, generator) {
-        super(projectPath, generator, __dirname)
-        this.projectReader = new ProjectReader(projectPath)
-    }
 
     async canRun() {
-        const projectDescriptor = await this.projectReader.read(this.options)
+        const projectDescriptor = await readProject(this.options)
         const { hasMta, hasHelm } = projectDescriptor.cap
         if (!hasHelm && hasMta) {
             throw `'cds add destinations' is not available for Cloud Foundry yet`
@@ -28,12 +24,12 @@ module.exports = class DestinationsTemplate extends require('../templateBase') {
     }
 
     async runDependentMerging(context = {}) {
-        const projectDescriptor = await this.projectReader.read(this.options)
+        const projectDescriptor = await readProject(this.options)
         const { hasHelm, hasDestination, hasHtml5Repo } = projectDescriptor.cap
 
         if (hasHelm) {
             //const env = await this.getEnv()
-            const binding = hasDestination && { srv: { bindings: { destination: { serviceInstanceName: 'destinations' }}}}
+            const binding = hasDestination && { srv: { bindings: { destination: { serviceInstanceName: 'destination' }}}}
             const html5Binding = hasHtml5Repo && { 'html5-apps-deployer': { bindings: { destination: { serviceInstanceName: 'destination' }}}}
 
             //in case facet is being added to the already exisiting charts folder
@@ -58,7 +54,26 @@ module.exports = class DestinationsTemplate extends require('../templateBase') {
                     }
                 }
             )
-            await copyAndTrack(join(__dirname, 'files', 'destination.yaml'), join(this.projectPath, 'chart', 'templates', 'destination.yaml'), context)
+            
+            // copy service instance chart if it is not present
+            const HelmTemplate = require(`../helm`);
+            const helmTemplate = new HelmTemplate(this.generator, context.oldTrackingData, context.newTrackingData);
+            isIndependentCommand = isIndependentCommand | await helmTemplate.addSubChart('service-instance');
+
+            // add dependency entry in chart.yaml
+            await mergeYAML(
+                join(this.projectPath, 'chart', 'Chart.yaml'),
+                join(__dirname, 'files', 'destination.yaml'),
+                projectDescriptor,
+                { additions: [{
+                    in: `dependencies`,
+                    where: [{
+                        property: 'alias',
+                        isEqualTo: 'destination'
+                    }]
+                }]}
+            )
+
             if(isIndependentCommand) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData)
         }
     }

package/lib/init/template/enterprise-messaging/files/event-mesh.yaml

@@ -1 +1,4 @@
-{{- include "cap.service-instance" . }}
+dependencies:
+  - name: service-instance
+    alias: event-mesh
+    version: 0.1.0

package/lib/init/template/enterprise-messaging/files/values.yaml

@@ -2,7 +2,6 @@ srv:
   bindings:
     messaging:
       serviceInstanceName: event-mesh
-event_mesh:
+event-mesh:
   serviceOfferingName: enterprise-messaging
   servicePlanName: default
-  config: event-mesh.json

package/lib/init/template/enterprise-messaging/index.js

@@ -1,39 +1,36 @@
 const { join } = require('path')
-const ProjectReader = require('../../util/projectReader')
+const { readProject } = require('../../util/projectReader')
 const { mergeJSON, mergeYAML } = require('../../util/merge')
-const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5Tracking')
+const { parseMd5File, writeMd5File } = require('../../util/md5Tracking')
 const { srvNode, srvJava, enterpriseMessaging } = require('../_merging/registry-mta')
 
 module.exports = class EnterpriseMessagingTemplate extends require('../templateBase') {
-  constructor(projectPath, generator) {
-    super(projectPath, generator, __dirname)
-    this.projectReader = new ProjectReader(projectPath)
-  }
+
 
   static hasFacet(env) {
-    return env.requires?.messaging === 'enterprise-messaging'
+    return env.requires?.messaging?.kind === 'enterprise-messaging-http'
   }
 
   async run() {
-    const projectDescriptor = await this.projectReader.read(this.options)
+    const projectDescriptor = await readProject(this.options)
     const { for: forProfile, isNodejs } = projectDescriptor.cap
     const templatePath = join(__dirname, 'files')
     const cdsTemplateFile = (isNodejs ? 'cds.package.json' : 'cdsrc.json') + (forProfile ? '.hbs' : '')
     const cdsTemplatePath = join(templatePath, cdsTemplateFile)
     const configPath = join(this.projectPath, isNodejs ? 'package.json' : '.cdsrc.json')
     await mergeJSON(configPath, cdsTemplatePath, projectDescriptor)
+    await mergeJSON('event-mesh.json', join(__dirname, 'files', 'event-mesh.json.hbs'), projectDescriptor)
     await this.runDependentMerging()
   }
 
   async runDependentMerging(context = {}) {
-    const projectDescriptor = await this.projectReader.read(this.options)
+    const projectDescriptor = await readProject(this.options)
     const { hasHelm, hasMta, isNodejs } = projectDescriptor.cap
 
     if (hasMta) {
-      const mtaYAMLPath = join(this.projectPath, 'mta.yaml')
       const srv = isNodejs ? srvNode : srvJava
       await mergeYAML(
-          mtaYAMLPath,
+          'mta.yaml',
           join(__dirname, 'files', 'mta.yaml.hbs'),
           projectDescriptor,
           {
@@ -44,11 +41,6 @@ module.exports = class EnterpriseMessagingTemplate extends require('../templateB
               }]
           }
       )
-      await mergeJSON(
-        join(this.projectPath, 'event-mesh.json'),
-        join(__dirname, 'files', 'event-mesh.json.hbs'),
-        projectDescriptor
-      )
     }
 
     if (hasHelm) {
@@ -59,15 +51,31 @@ module.exports = class EnterpriseMessagingTemplate extends require('../templateB
           context.projectPath = this.projectPath
           context.oldTrackingData = context.newTrackingData = await parseMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'))
       }
+
       await mergeYAML(
         join(this.projectPath, 'chart', 'values.yaml'),
         join(__dirname, 'files', 'values.yaml')
       )
-      await copyAndTrack(
-         join(__dirname, 'files', 'event-mesh.yaml'),
-         join(this.projectPath, 'chart', 'templates', 'event-mesh.yaml'),
-         context
+
+      // copy service instance chart if it is not present
+      const HelmTemplate = require(`../helm`);
+      const helmTemplate = new HelmTemplate(this.generator, context.oldTrackingData, context.newTrackingData);
+      isIndependentCommand = isIndependentCommand | await helmTemplate.addSubChart('service-instance');
+
+      // add dependency entry in chart.yaml
+      await mergeYAML(
+        join(this.projectPath, 'chart', 'Chart.yaml'),
+        join(__dirname, 'files', 'event-mesh.yaml'),
+        projectDescriptor,
+        { additions: [{
+            in: `dependencies`,
+            where: [{
+                property: 'alias',
+                isEqualTo: 'event-mesh'
+            }]
+        }]}
       )
+
       if(isIndependentCommand) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData)
     }
   }

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

@@ -1,12 +1,15 @@
+const cds = require('../../../cds')
+const { read, write, exists } = cds.utils
 const { join } = require('path')
-const ProjectReader = require('../../util/projectReader')
+const { readProject } = require('../../util/projectReader')
 const { mergeJSON } = require('../../util/merge')
-const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5Tracking')
+const { OPTION_MULTITENANCY } = require('../../constants')
 
 module.exports = class ExtensibilityTemplate extends require('../templateBase') {
-  constructor(projectPath, generator) {
-    super(projectPath, generator, __dirname)
-    this.projectReader = new ProjectReader(projectPath)
+
+
+  getDependencies() {
+    return exists('pom.xml') ? [OPTION_MULTITENANCY] : [] // REVISIT: Remove this dependency
   }
 
   static hasFacet(env) {
@@ -14,33 +17,38 @@ module.exports = class ExtensibilityTemplate extends require('../templateBase')
   }
 
   async run() {
-    const projectDescriptor = await this.projectReader.read(this.options)
-    const { for: forProfile, isJava } = projectDescriptor.cap
+    const projectDescriptor = await readProject(this.options)
+    const { for: forProfile, isJava, hasSidecar } = projectDescriptor.cap
     const cdsConfigPath = join(this.projectPath, isJava ? '.cdsrc.json' : 'package.json')
     const cdsTemplateFile = forProfile ? (isJava ? 'cdsrc.json.hbs' : 'cds.package.json.hbs') : (isJava ? 'cdsrc.json' : 'cds.package.json')
     await mergeJSON(cdsConfigPath, join(__dirname, 'files', cdsTemplateFile), projectDescriptor)
+    if (hasSidecar) {
+      const out = join('mtx', 'sidecar', 'package.json')
+      const config = await read(out)
+      if (!('cds.xt.ExtensibilityService' in config.cds.requires)) {
+        config.cds.requires['cds.xt.ExtensibilityService'] = true
+        await write(out, config, { spaces: 2 })
+      }
+    }
     await this.runDependentMerging()
   }
 
-  async runDependentMerging(context = {}) {
-    const projectDescriptor = await this.projectReader.read()
-    const { hasXsuaa, hasHelm, hasApprouter } = projectDescriptor.cap
+  async runDependentMerging() {
+    const projectDescriptor = await readProject()
+    const { hasXsuaa, hasApprouter } = projectDescriptor.cap
     if (hasXsuaa) {
       await mergeJSON(
-        join(this.projectPath, 'xs-security.json'),
+        'xs-security.json',
         join(__dirname, 'files', 'xs-security.json.hbs'),
         projectDescriptor,
         {
           additions: [{
-            ref: 'scope-extension-developer',
             in: 'scopes',
             where: [{ property: 'name', isEqualTo: '$XSAPPNAME.cds.ExtensionDeveloper' }],
           }, {
-            ref: 'scope-uiflex',
             in: 'scopes',
             where: [{ property: 'name', isEqualTo: '$XSAPPNAME.cds.UIFlexDeveloper' }],
           }, {
-            ref: 'template-extension-developer',
             in: 'role-templates',
             where: [{ property: 'name', isEqualTo: 'ExtensionDeveloper' }],
           }]
@@ -49,24 +57,8 @@ module.exports = class ExtensibilityTemplate extends require('../templateBase')
     }
     if (hasApprouter) {
       const ApprouterTemplate = require(`../approuter`)
-      const approuterTemplate = new ApprouterTemplate(this.projectPath, this.generator)
+      const approuterTemplate = new ApprouterTemplate(this.generator)
       await approuterTemplate.runDependentMerging()
-  }
-    if (hasXsuaa && hasHelm) {
-      //in case facet is being added to the already exisiting charts folder
-      let isIndependentCommand = false
-      if(Object.keys(context).length == 0){
-          isIndependentCommand = true
-          context.projectPath = this.projectPath
-          context.oldTrackingData = context.newTrackingData = await parseMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'))
-      }
-      // REVISIT: Shared xs-security.json location for Helm and MTA?
-      await copyAndTrack(
-        join(this.projectPath, 'xs-security.json'),
-        join(this.projectPath, 'chart', 'xs-security.json'),
-        context
-      )
-      if(isIndependentCommand) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData)
     }
   }
 }

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

@@ -1 +1,4 @@
-{{- include "cap.service-instance" . }}
+dependencies:
+  - name: service-instance
+    alias: hana
+    version: 0.1.0

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

@@ -5,9 +5,9 @@ const commandUtil = require('../../util/commandUtil');
 const mvnArchetypes = require('../../util/mvnArchetypeUtil');
 const term = require('../../../util/term');
 const { mergeJSON, mergeYAML, removeFromYAML, removeFromYAMLArray } = require('../../util/merge')
-const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5Tracking')
+const { parseMd5File, writeMd5File } = require('../../util/md5Tracking')
 const { copyFiles } = require('../../util/templateUtil')
-const ProjectReader = require('../../util/projectReader');
+const { readProject } = require('../../util/projectReader');
 const versionCompare = require('../../util/versionCompare');
 
 const { PROJECT_TYPE, OPTION_JAVA, URLS } = require('../../constants');
@@ -15,10 +15,6 @@ const { PROJECT_TYPE, OPTION_JAVA, URLS } = require('../../constants');
 const { srvNode, srvJava, hdbDeployer, serviceManager, hdiContainer, mtxSidecar } = require('../_merging/registry-mta');
 
 module.exports = class HanaTemplate extends require('../templateBase') {
-    constructor(projectPath, generator) {
-        super(projectPath, generator, __dirname);
-        this.projectReader = new ProjectReader(projectPath);
-    }
 
     static hasFacet(env) {
         return env.requires?.db?.kind === 'hana'
@@ -43,7 +39,7 @@ module.exports = class HanaTemplate extends require('../templateBase') {
         const undeployJSONTemplatePath = join(__dirname, 'files', 'common', 'undeploy.json');
         await mergeJSON(undeployJSONPath, undeployJSONTemplatePath);
 
-        const projectType = await this.getProjectType();
+        const projectType = this.getProjectType();
         switch (projectType) {
             case PROJECT_TYPE.java: {
                 await copyFiles(join(__dirname, 'files', 'java', 'db'), join(this.projectPath, env.folders.db), {}, this.options.force);
@@ -85,9 +81,9 @@ module.exports = class HanaTemplate extends require('../templateBase') {
             }
         }
     }
-    
+
     async runDependentMerging(context = {}) {
-        const projectDescriptor = await this.projectReader.read(this.options)
+        const projectDescriptor = await readProject(this.options)
         const { hasMta, hasHelm, hasHtml5Repo, isNodejs, isJava, isMultitenant } = projectDescriptor.cap
 
         if (isMultitenant) {
@@ -136,7 +132,7 @@ module.exports = class HanaTemplate extends require('../templateBase') {
 
             await mergeYAML(
                 mtaYAMLPath,
-                `${__dirname}/files/mta.yaml.hbs`,
+                join(__dirname, 'files', 'mta.yaml.hbs'),
                 projectDescriptor,
                 { additions: [...modules, db].filter(a => a), deletions, relationships }
             )
@@ -178,32 +174,39 @@ module.exports = class HanaTemplate extends require('../templateBase') {
                 if(exists(hanaInstanceTemplatePath)) {
                     await rm(hanaInstanceTemplatePath);
                 }
+
+                await mergeYAML(
+                    join(this.projectPath, 'chart', 'Chart.yaml'),
+                    join(__dirname, 'files', 'hana.yaml'),
+                    projectDescriptor,
+                    { deletions: [{
+                        item: {
+                            in: `dependencies`,
+                            where: [{
+                                property: 'alias',
+                                isEqualTo: 'hana'
+                            }]
+                        }
+                    }]}
+                )
             } else {
                 await mergeYAML(
                     join(this.projectPath, 'chart', 'values.yaml'),
                     join(__dirname, 'files', 'values.yaml.hbs'),
                     projectDescriptor
                 )
-                await copyAndTrack(
-                    join(__dirname, 'files', 'hana.yaml'),
-                    join(this.projectPath, 'chart', 'templates', 'hana.yaml'),
-                    context
-                )
 
                 // copy content deployment chart if it is not present
-                const contentDeploymentSubchartPath = join(this.projectPath, 'chart', 'charts', 'content-deployment');
-                if(!exists(contentDeploymentSubchartPath)) {
-                    const contentDeploymentResourcePath = join(__dirname, '..', 'helm', 'subcharts', 'content-deployment');
-                    await copyAndTrack(contentDeploymentResourcePath, contentDeploymentSubchartPath, context);
-                }
+                const HelmTemplate = require(`../helm`);
+                const helmTemplate = new HelmTemplate(this.generator, context.oldTrackingData, context.newTrackingData);
+                shouldUpdateTrackingFile = shouldUpdateTrackingFile | await helmTemplate.addSubChart('content-deployment');
 
                 // add dependency entry in chart.yaml
                 await mergeYAML(
                     join(this.projectPath, 'chart', 'Chart.yaml'),
-                    join(__dirname, 'files', 'chart.yaml'),
+                    join(__dirname, 'files', 'hana-deployer.yaml'),
                     projectDescriptor,
                     { additions: [{
-                        ref: `content-deployment-hana-deployer`,
                         in: `dependencies`,
                         where: [{
                             property: 'alias',
@@ -211,6 +214,23 @@ module.exports = class HanaTemplate extends require('../templateBase') {
                         }]
                     }]}
                 )
+
+                // add service instance chart if it is not present
+                shouldUpdateTrackingFile = shouldUpdateTrackingFile | await helmTemplate.addSubChart('service-instance');
+
+                // add dependency entry in chart.yaml
+                await mergeYAML(
+                    join(this.projectPath, 'chart', 'Chart.yaml'),
+                    join(__dirname, 'files', 'hana.yaml'),
+                    projectDescriptor,
+                    { additions: [{
+                        in: `dependencies`,
+                        where: [{
+                            property: 'alias',
+                            isEqualTo: 'hana'
+                        }]
+                    }]}
+                )
             }
             if(shouldUpdateTrackingFile) await writeMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'), context.newTrackingData);
         }
@@ -248,10 +268,10 @@ module.exports = class HanaTemplate extends require('../templateBase') {
     }
 
     async _updateCdsConfiguration(configPath) {
-        const projectType = await this.getProjectType();
+        const projectType = this.getProjectType();
         const configFile = projectType === PROJECT_TYPE.nodejs ? 'package.json' : '.cdsrc.json';
         configPath = configPath ?? join(this.projectPath, configFile)
-        const projectDescriptor = await this.projectReader.read(this.options);
+        const projectDescriptor = await readProject(this.options);
         const { for: forProfile } = projectDescriptor.cap;
         let json; try { json = await read(configPath, 'utf8') } catch { /* ignore */ }
         const _cds = projectType === PROJECT_TYPE.nodejs ? json?.cds : json;

package/lib/init/template/helm/chart/templates/_helpers.tpl

@@ -130,4 +130,16 @@ spec:
     {{- end }}
     {{- $name }}
   {{- end }}
+{{- end }}
+
+{{/*
+    Saas Registry Parameters
+*/}}
+{{- define "cap.service-instance.saasRegistryParameters" -}}
+  {{- $srvHostFull := include "cap.deploymentHostFull" (merge (dict "name" "srv" "deployment" .Values.srv) . ) }}
+  {{- $parameters := .Values.saasRegistryParameters }}
+  {{- $appUrls := $parameters.appUrls }}
+  {{- $_ := set $appUrls "getDependencies" (printf "https://%s%s" $srvHostFull $appUrls.getDependencies) }}
+  {{- $_ := set $appUrls "onSubscription" (printf "https://%s%s" $srvHostFull $appUrls.onSubscription) }}
+  {{- $parameters | mustToJson }}
 {{- end }}

package/lib/init/template/helm/chart/values.root.schema.json

@@ -21,6 +21,46 @@
             "$id": "#/properties/html5-apps-deployer",
             "description": "Content Deployment",
             "$ref": "./charts/content-deployment/values.schema.json"
+        },
+        "event-mesh": {
+            "$id": "#/properties/event-mesh",
+            "description": "Service Instance",
+            "$ref": "./charts/service-instance/values.schema.json"
+        },
+        "html5-apps-repo-host": {
+            "$id": "#/properties/html5-apps-repo-host",
+            "description": "Service Instance",
+            "$ref": "./charts/service-instance/values.schema.json"
+        },
+        "xsuaa": {
+            "$id": "#/properties/xsuaa",
+            "description": "Service Instance",
+            "$ref": "./charts/service-instance/values.schema.json"
+        },
+        "auditlog": {
+            "$id": "#/properties/auditlog",
+            "description": "Service Instance",
+            "$ref": "./charts/service-instance/values.schema.json"
+        },
+        "destination": {
+            "$id": "#/properties/destination",
+            "description": "Service Instance",
+            "$ref": "./charts/service-instance/values.schema.json"
+        },
+        "hana": {
+            "$id": "#/properties/hana",
+            "description": "Service Instance",
+            "$ref": "./charts/service-instance/values.schema.json"
+        },
+        "saas-registry": {
+            "$id": "#/properties/saas-registry",
+            "description": "Service Instance",
+            "$ref": "./charts/service-instance/values.schema.json"
+        },
+        "service-manager": {
+            "$id": "#/properties/service-manager",
+            "description": "Service Instance",
+            "$ref": "./charts/service-instance/values.schema.json"
         }
     }
 }

package/lib/init/template/helm/chart/values.schema.json

@@ -54,6 +54,38 @@
             "$id": "#/properties/approuter",
             "description": "Deployment"
         },
+        "event-mesh": {
+            "$id": "#/properties/event-mesh",
+            "description": "Service Instance"
+        },
+        "html5-apps-repo-host": {
+            "$id": "#/properties/html5-apps-repo-host",
+            "description": "Service Instance"
+        },
+        "xsuaa": {
+            "$id": "#/properties/xsuaa",
+            "description": "Service Instance"
+        },
+        "auditlog": {
+            "$id": "#/properties/auditlog",
+            "description": "Service Instance"
+        },
+        "destination": {
+            "$id": "#/properties/destination",
+            "description": "Service Instance"
+        },
+        "hana": {
+            "$id": "#/properties/hana",
+            "description": "Service Instance"
+        },
+        "saas-registry": {
+            "$id": "#/properties/saas-registry",
+            "description": "Service Instance"
+        },
+        "service-manager": {
+            "$id": "#/properties/service-manager",
+            "description": "Service Instance"
+        },
         "backendDestinations": {
             "$id": "#/properties/backendDestinations",
             "title": "Backend Destinations for Approuter or HTML5 Apps Deployer",
@@ -76,75 +108,6 @@
                     }
                 }
             }
-        },
-        "auditlog": {
-            "$id": "#/properties/auditlog",
-            "$ref": "#/definitions/ServiceInstance"
-        },
-        "destinations": {
-            "$id": "#/properties/destinations",
-            "$ref": "#/definitions/ServiceInstance"
-        },
-        "connectivity": {
-            "type": "object",
-            "additionalProperties": false,
-            "required": [
-                "serviceOfferingName",
-                "servicePlanName",
-                "configMapName",
-                "secretName"
-            ],
-            "properties": {
-                "fullnameOverride": {
-                    "type": "string",
-                    "pattern": "[0-9a-z][0-9a-z-.]*",
-                    "maxLength": 63,
-                    "description": "If present then this will be used instead of the generated name"
-                },
-                "enabled": {
-                    "type": "boolean",
-                    "default": true,
-                    "description": "Service instance will be created (default: true)"
-                },
-                "serviceOfferingName": {
-                    "type": "string",
-                    "default": "connectivity",
-                    "description": "Technical service offering name from service catalog"
-                },
-                "servicePlanName": {
-                    "type": "string",
-                    "default": "connectivity_proxy",
-                    "description": "Technical service plan name from service catalog"
-                },
-                "parameters": {
-                    "type": "object",
-                    "description": "Some services support the provisioning of additional configuration parameters during the instance creation. For the list of supported parameters, check the documentation of the particular service offering."
-                },
-                "config": {
-                    "type": "string",
-                    "description": "File name of JSON configuration file in chart folder. Values from the file will be copied and placed in the parameters for the service instance. If both parameters and config are specified, the values in parameters override those read from config."
-                },
-                "configMapName": {
-                    "type": "string",
-                    "description": "Required to add additional connection information, compared to what is available from the service binding."
-                },
-                "secretName": {
-                    "type": "string",
-                    "description": "Required to add additional connection information."
-                }
-            }
-        },
-        "event_mesh": {
-            "$id": "#/properties/event_mesh",
-            "$ref": "#/definitions/ServiceInstance"
-        },
-        "html5_apps_repo_host": {
-            "$id": "#/properties/html5_apps_repo_host",
-            "$ref": "#/definitions/ServiceInstance"
-        },
-        "xsuaa": {
-            "$id": "#/properties/xsuaa",
-            "$ref": "#/definitions/ServiceInstance"
         }
     },
     "definitions": {