Skip to content

Feature/create user provided service instances #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bobbytes wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature/create user provided service instances #31

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3cce12
✨ add create user provided service instance to prepare command
bobbytes Aug 2, 2019
6d49516
🚧 do not wait wor user provided service instances
bobbytes Aug 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions prepare.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const _fp = require('lodash/fp');
const WF = require('push2cloud-workflow-utils');

const waterfall = WF.waterfall;
Expand All @@ -6,8 +7,13 @@ const map = WF.map;
const mapLimit = WF.mapLimit(Math.round(require('os').cpus().length / 2));
const mapSeries = WF.mapSeries;
const packageApp = WF.packageApp;
const from = WF.from;

const desiredApps = (api, log, services) =>
const userProvidedServiceType = 'user-provided';
const services = _fp.filter((service) => service.type !== userProvidedServiceType);
const userProvidedServices = _fp.filter((service) => service.type === userProvidedServiceType);

const desiredApps = (api, log, allServices) =>
waterfall(
[ step(log('prepare desired apps'))
, step(log('===================='))
Expand All @@ -16,7 +22,9 @@ const desiredApps = (api, log, services) =>
, step(log('package apps'))
, mapLimit(packageApp, 'desired.apps')
, step(log('create service instances'))
, mapLimit(api.createServiceInstance, services || 'desired.services')
, mapLimit(api.createServiceInstance, from(allServices || 'desired.services', services))
, step(log('create user provided service instances'))
, mapLimit(api.createUserProvidedServiceInstance, from(allServices || 'desired.services', userProvidedServices))
, step(log('create routes'))
, map(api.createRoute, 'desired.routes')
, step(log('push apps'))
Expand All @@ -26,24 +34,25 @@ const desiredApps = (api, log, services) =>
, step(log('stage apps'))
, map(api.stageApp, 'desired.apps')
, step(log('wait for services to be ready to bind'))
, map(api.waitForServiceInstance, services || 'desired.services')
, map(api.waitForServiceInstance, from(allServices || 'desired.services', services))
, step(log('bind services'))
, mapSeries(api.bindService, 'desired.serviceBindings')
, step(log('start apps and wait for instances'))
, step(log('desired apps prepared'))
]
);

const prepareApps = (api, log, what, services) =>
const prepareApps = (api, log, what, allServices) =>
waterfall(
[ step(log('prepare apps'))
, step(log('===================='))

, step(log('start deployment'))
, step(log('package apps'))
, map(packageApp, what.apps)
, step(log('create service instances'))
, mapLimit(api.createServiceInstance, services || what.services)
, mapLimit(api.createServiceInstance, from(allServices || what.services, services))
, step(log('create user provided service instances'))
, mapLimit(api.createUserProvidedServiceInstance, from(allServices || what.services, userProvidedServices))
, step(log('create routes'))
, map(api.createRoute, what.routes)
, step(log('push apps'))
Expand All @@ -53,7 +62,7 @@ const prepareApps = (api, log, what, services) =>
, step(log('stage apps'))
, map(api.stageApp, what.apps)
, step(log('wait for services to be ready to bind'))
, map(api.waitForServiceInstance, services || what.services)
, map(api.waitForServiceInstance, from(allServices || what.services, services))
, step(log('bind services'))
, mapSeries(api.bindService, what.serviceBindings)
, step(log('start apps and wait for instances'))
Expand Down