Spearhead/joyent-portal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

feat(portal-data): importable() don't list already imported DeploymentGroups

Browse Source
This commit is contained in:
Sérgio Ramos 2017-06-27 16:14:00 +01:00 committed by Judit Greskovits
parent 12fa092c3b
commit 05bc971a58
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/portal-data/lib/index.js
View File

@ -1380,10 +1380,18 @@ module.exports = class Data extends EventEmitter {
return cb(null, []); return cb(null, []);
} }
this.getDeploymentGroups({}, (err, dgs) => {
if (err) {
return cb(err);
}
const names = dgs.map(({ name }) => { return name; });
return cb( return cb(
null, null,
UniqBy( UniqBy(
machines machines
.filter(({ tags = {} }) => { return names.indexOf(tags[DEPLOYMENT_GROUP]) < 0; })
.filter(({ state }) => { return NON_IMPORTABLE_STATES.indexOf(state.toUpperCase()) < 0; }) .filter(({ state }) => { return NON_IMPORTABLE_STATES.indexOf(state.toUpperCase()) < 0; })
.filter(({ tags = {} }) => { return [DEPLOYMENT_GROUP, SERVICE, HASH].every((name) => { return tags[name]; }); } .filter(({ tags = {} }) => { return [DEPLOYMENT_GROUP, SERVICE, HASH].every((name) => { return tags[name]; }); }
) )
@ -1397,6 +1405,7 @@ module.exports = class Data extends EventEmitter {
'slug' 'slug'
) )
); );
});
} }
importDeploymentGroup ({ deploymentGroupSlug }, cb) { importDeploymentGroup ({ deploymentGroupSlug }, cb) {