Catalog handling to filter plans/services in case of cross consumption

config/settings.yml

@@ -432,6 +432,9 @@ defaults: &defaults
       secret: 'service-fabrik-blueprint-secret'
       redirect_uri: <%= redirect_uri %>
     plan_updateable: true
+    supported_platform:
+    - k8s
+    - cf
     plans:
     ###########################
     # CONTAINER SERVICE PLANS #
@@ -565,6 +568,9 @@ defaults: &defaults
         - '1 vCPUs'
         - '1 GB Memory'
         - '1 GB Disk'
+      supported_platform:
+      - k8s
+      - cf
     - &blueprint_plan4
       id: 'bc158c9a-7934-401e-94ab-057082a5073e'
       name: 'v1.0-small'
@@ -594,6 +600,9 @@ defaults: &defaults
         - '1 vCPUs'
         - '1 GB Memory'
         - '2 GB Disk'
+      supported_platform:
+      - k8s
+      - cf
     - &blueprint_plan5
       id: 'd616b00a-5949-4b1c-bc73-0d3c59f3954a'
       name: 'v1.0-large'
@@ -624,6 +633,9 @@ defaults: &defaults
         - '1 vCPUs'
         - '2 GB Memory'
         - '2 GB Disk'
+      supported_platform:
+      - k8s
+      - cf
     - &blueprint_plan6
       id: 'b91d9512-b5c9-4c4a-922a-fa54ae67d235'
       name: 'v1.0-dedicated-large-deprecated'

lib/constants.js

@@ -180,8 +180,14 @@ module.exports = Object.freeze({
     K8S: 'kubernetes'
   },
 
+  PLATFORM_ALIAS_MAPPINGS: {
+    'cf': 'cloudfoundry',
+    'k8s': 'kubernetes'
+  },
+
   PLATFORM_MANAGER: {
-    'cloudfoundry': 'CfPlatformManager'
+    'cloudfoundry': 'CfPlatformManager',
+    'kubernetes': 'K8sPlatformManager'
   },
 
   AGENT: {

lib/controllers/ServiceBrokerApiController.js

@@ -25,7 +25,6 @@ class ServiceBrokerApiController extends BaseController {
   apiVersion(req, res) {
     /* jshint unused:false */
     const minVersion = CONST.SF_BROKER_API_VERSION_MIN;
-    const minCloudControllerApiVersion = '2.57.0';
     const version = _.get(req.headers, 'x-broker-api-version', '1.0');
     return Promise
       .try(() => {
@@ -34,20 +33,13 @@ class ServiceBrokerApiController extends BaseController {
         } else {
           throw new PreconditionFailed(`At least Broker API version ${minVersion} is required.`);
         }
-        return this.cloudController
-          .getApiVersion()
-          .then(apiVersion => {
-            if (utils.compareVersions(apiVersion, minCloudControllerApiVersion) < 0) {
-              throw new PreconditionFailed(`At least Cloud Controller API version ${minCloudControllerApiVersion} is required.`);
-            }
-          });
       })
       .throw(new ContinueWithNext());
   }
 
   getCatalog(req, res) {
     /* jshint unused:false */
-    res.status(200).json(catalog);
+    res.status(200).json(this.fabrik.getPlatformManager(req.params.platform).getCatalog(catalog));
   }
 
   putInstance(req, res) {

lib/fabrik/BasePlatformManager.js

@@ -1,15 +1,12 @@
 'use strict';
 
-const CONST = require('../constants');
-
 class BasePlatformManager {
-  constructor(guid, context) {
-    this.guid = guid;
-    this.context = context;
+  constructor(platform) {
+    this.platform = platform;
   }
 
-  get platform() {
-    return this.context.platform;
+  getCatalog(catalog) {
+    return catalog;
   }
 
   postInstanceProvisionOperations(options) {
@@ -24,18 +21,9 @@ class BasePlatformManager {
     /* jshint unused:false */
   }
 
-  ensureTenantId(tenant_id) {
+  ensureTenantId(options) {
     /* jshint unused:false */
   }
 
-  static getInstance(instance_id, context) {
-    const PlatformManager = (context && CONST.PLATFORM_MANAGER[context.platform]) ? require(`./${CONST.PLATFORM_MANAGER[context.platform]}`) : undefined;  
-    if (PlatformManager === undefined) {
-      return new BasePlatformManager(instance_id, context);  
-    } else { 
-      return new PlatformManager(instance_id, context);  
-    }
-  }
-
 }
 module.exports = BasePlatformManager;

lib/fabrik/CfPlatformManager.js

@@ -14,37 +14,36 @@ const SecurityGroupNotFound = errors.SecurityGroupNotFound;
 const ordinals = ['First', 'Second', 'Third', 'Fourth', 'Fifth', 'Sixth', 'Seventh', 'Eighth', 'Ninth', 'Tenth'];
 
 class CfPlatformManager extends BasePlatformManager {
-  constructor(guid, context) {
-    super(guid, context);
-    this.space_guid = context.space_guid;
+  constructor(platform) {
+    super(platform);
     this.cloudController = cloudController;
   }
 
-  get securityGroupName() {
-    return `${CONST.SERVICE_FABRIK_PREFIX}-${this.guid}`;
+  getSecurityGroupName(guid) {
+    return `${CONST.SERVICE_FABRIK_PREFIX}-${guid}`;
   }
 
   postInstanceProvisionOperations(options) {
-    return this.createSecurityGroup(options.ipRuleOptions);
+    return this.createSecurityGroup(options);
   }
 
-  preInstanceDeleteOperations() {
-    return this.deleteSecurityGroup();
+  preInstanceDeleteOperations(options) {
+    return this.deleteSecurityGroup(options);
   }
 
   postInstanceUpdateOperations(options) {
-    return this.ensureSecurityGroupExists(options.ipRuleOptions);
+    return this.ensureSecurityGroupExists(options);
   }
 
-  createSecurityGroup(ruleOptions) {
-    const name = this.securityGroupName;
-    const rules = _.map(ruleOptions, opts => this.buildSecurityGroupRules(opts));
+  createSecurityGroup(options) {
+    const name = this.getSecurityGroupName(options.guid);
+    const rules = _.map(options.ruleOptions, opts => this.buildSecurityGroupRules(opts));
     logger.info(`Creating security group '${name}' with rules ...`, rules);
     return utils
       .retry(tries => {
         logger.info(`+-> ${ordinals[tries]} attempt to create security group '${name}'...`);
         return this.cloudController
-          .createSecurityGroup(name, rules, [this.space_guid])
+          .createSecurityGroup(name, rules, [options.context.space_guid])
           .catch(err => {
             logger.error(err);
             throw err;
@@ -62,21 +61,21 @@ class CfPlatformManager extends BasePlatformManager {
       });
   }
 
-  ensureSecurityGroupExists(ruleOptions) {
-    const name = this.securityGroupName;
+  ensureSecurityGroupExists(options) {
+    const name = this.getSecurityGroupName(options.guid);
     logger.info(`Ensuring existence of security group '${name}'...`);
     return this.cloudController
       .findSecurityGroupByName(name)
       .tap(() => logger.info('+-> Security group exists'))
       .catch(SecurityGroupNotFound, () => {
         logger.warn('+-> Security group does not exist. Trying to create it again.');
-        return this.ensureTenantId(this.space_guid)
-          .then(() => this.createSecurityGroup(ruleOptions));
+        return this.ensureTenantId(options.context.space_guid)
+          .then(() => this.createSecurityGroup(options.ruleOptions));
       });
   }
 
-  deleteSecurityGroup() {
-    const name = this.securityGroupName;
+  deleteSecurityGroup(options) {
+    const name = this.getSecurityGroupName(options.guid);
     logger.info(`Deleting security group '${name}'...`);
     return this.cloudController
       .findSecurityGroupByName(name)
@@ -95,10 +94,10 @@ class CfPlatformManager extends BasePlatformManager {
       });
   }
 
-  ensureTenantId(space_guid) {
+  ensureTenantId(options) {
     return Promise
-      .try(() => space_guid ? space_guid : this.cloudController
-        .getServiceInstance(this.guid)
+      .try(() => options.context.space_guid ? options.context.space_guid : this.cloudController
+        .getServiceInstance(options.guid)
         .then(instance => instance.entity.space_guid)
       );
   }

lib/fabrik/DirectorInstance.js

@@ -71,7 +71,9 @@ class DirectorInstance extends BaseInstance {
         if (operation.type === 'delete') {
           return Promise
             .all([
-              this.platformManager.preInstanceDeleteOperations(),
+              this.platformManager.preInstanceDeleteOperations({
+                guid: this.guid
+              }),
               this.deleteRestoreFile()
             ]);
         }
@@ -80,7 +82,10 @@ class DirectorInstance extends BaseInstance {
 
   deleteRestoreFile() {
     if (_.includes(this.manager.agent.features, 'backup')) {
-      return Promise.try(() => this.platformManager.ensureTenantId())
+      return Promise.try(() => this.platformManager.ensureTenantId({
+          context: this.platformContext,
+          guid: this.guid
+        }))
         .then(tenant_id => tenant_id ? this.manager.deleteRestoreFile(tenant_id, this.guid) : Promise.resolve({}))
         .catch(err => {
           logger.error(`Failed to delete restore file of instance '${this.guid}'`);
@@ -110,13 +115,17 @@ class DirectorInstance extends BaseInstance {
               minDelay: 1000
             })
             .then(() => this.platformManager.postInstanceProvisionOperations({
-              ipRuleOptions: this.buildIpRules()
+              ipRuleOptions: this.buildIpRules(),
+              guid: this.guid,
+              context: this.platformContext
             }))
             .tap(() => operation.state === CONST.OPERATION.SUCCEEDED ? this.scheduleAutoUpdate() : {});
 
         case 'update':
           return this.platformManager.postInstanceUpdateOperations({
-            ipRuleOptions: this.buildIpRules()
+            ipRuleOptions: this.buildIpRules(),
+            guid: this.guid,
+            context: this.platformContext
           });
         }
       })

lib/fabrik/DockerInstance.js

@@ -81,7 +81,9 @@ class DockerInstance extends BaseInstance {
       .catchThrow(DockerError.Conflict, new ServiceInstanceAlreadyExists(this.guid))
       .then(() => this.ensureContainerIsRunning(true))
       .then(() => this.platformManager.postInstanceProvisionOperations({
-        ipRuleOptions: this.buildIpRules()
+        ipRuleOptions: this.buildIpRules(),
+        guid: this.guid,
+        context: this.platformContext
       }));
   }
 
@@ -106,7 +108,9 @@ class DockerInstance extends BaseInstance {
   delete(params) {
     /* jshint unused:false */
     return Promise.try(() => this
-        .platformManager.preInstanceDeleteOperations()
+        .platformManager.preInstanceDeleteOperations({
+          guid: this.guid
+        })
       )
       .then(() => this.removeContainer())
       .catchThrow(DockerError.NotFound, new ServiceInstanceNotFound(this.guid))

lib/fabrik/Fabrik.js

@@ -13,6 +13,7 @@ const FabrikStatusPoller = require('./FabrikStatusPoller');
 const DBManager = require('./DBManager');
 const OobBackupManager = require('./OobBackupManager');
 const BasePlatformManager = require('./BasePlatformManager');
+const CONST = require('../constants');
 
 class Fabrik {
   static createManager(plan) {
@@ -41,11 +42,20 @@ class Fabrik {
         const instance = manager.createInstance(instance_id);
         return Promise
           .try(() => context ? context : instance.platformContext)
-          .then(context => instance.assignPlatformManager(BasePlatformManager.getInstance(instance_id, context)))
+          .then(context => instance.assignPlatformManager(Fabrik.getPlatformManager(context.platform)))
           .return(instance);
       });
   }
 
+  static getPlatformManager(platform) {
+    const PlatformManager = (platform && CONST.PLATFORM_MANAGER[platform]) ? require(`./${CONST.PLATFORM_MANAGER[platform]}`) : ((platform && CONST.PLATFORM_MANAGER[CONST.PLATFORM_ALIAS_MAPPINGS[platform]]) ? require(`./${CONST.PLATFORM_MANAGER[CONST.PLATFORM_ALIAS_MAPPINGS[platform]]}`) : undefined);
+    if (PlatformManager === undefined) {
+      return new BasePlatformManager(platform);  
+    } else { 
+      return new PlatformManager(platform);  
+    }
+  }
+
   static createOperation(name, opts) {
     return new ServiceFabrikOperation(name, opts);
   }

lib/fabrik/K8sPlatformManager.js

@@ -0,0 +1,41 @@
+'use strict';
+
+const BasePlatformManager = require('./BasePlatformManager');
+const _ = require('lodash');
+
+class K8sPlatformManager extends BasePlatformManager {
+  constructor(platform) {
+    super(platform);
+    this.platform = platform;
+  }
+
+  getCatalog(catalog) {
+    const modifiedCatalog = _.cloneDeep(catalog);
+    const platform = this.platform;
+    _.remove(modifiedCatalog.services, function (service) {
+      _.remove(service.plans, function (plan) {
+        return !_.includes(_.get(plan, 'supported_platform'), platform);
+      });
+      return !_.includes(_.get(service, 'supported_platform'), platform);
+    });
+    return modifiedCatalog;
+  }
+
+  postInstanceProvisionOperations(options) {
+    /* jshint unused:false */
+  }
+
+  preInstanceDeleteOperations(options) {
+    /* jshint unused:false */
+  }
+
+  postInstanceUpdateOperations(options) {
+    /* jshint unused:false */
+  }
+
+  ensureTenantId(options) {
+    /* jshint unused:false */
+  }
+
+}
+module.exports = K8sPlatformManager;

lib/fabrik/VirtualHostInstance.js

@@ -5,6 +5,7 @@ const bosh = require('../bosh');
 const utils = require('../utils');
 const mapper = require('./VirtualHostRelationMapper');
 const catalog = require('../models').catalog;
+const CONST = require('../constants');
 
 class VirtualHostInstance extends BaseInstance {
   constructor(guid, manager) {
@@ -24,7 +25,12 @@ class VirtualHostInstance extends BaseInstance {
       .then(deploymentName => this.deploymentName = deploymentName);
   }
 
-  get platformContext() {}
+  get platformContext() {
+    const context = {
+      platform: CONST.PLATFORM.CF
+    };
+    return context;
+  }
 
   create(params) {
     return this.cloudController.getServiceInstanceByName(params.parameters.dedicated_rabbitmq_instance, params.space_guid)

lib/routes/cf/index.js → lib/routes/broker/index.js

@@ -2,5 +2,7 @@
 
 const express = require('express');
 require('../../utils/enableAbsMatchingRouteLookup')(express);
-const router = module.exports = express.Router();
+const router = module.exports = express.Router({
+  mergeParams: true
+});
 router.use('/v2', require('./v2'));

lib/routes/cf/v2.js → lib/routes/broker/v2.js

@@ -5,7 +5,9 @@ const config = require('../../config');
 const middleware = require('../../middleware');
 const controller = require('../../controllers').serviceBrokerApi;
 
-const router = module.exports = express.Router();
+const router = module.exports = express.Router({
+  mergeParams: true
+});
 const instanceRouter = express.Router({
   mergeParams: true
 });