From 8f8d81e260d2244ffe5106e1e160041e9c7643eb Mon Sep 17 00:00:00 2001 From: Udesh Date: Fri, 28 Oct 2016 13:56:08 +0530 Subject: [PATCH 1/2] added monitor support for chef --- server/7VfjUZ6o5qcZGYwVngTiJZJ7.rb | 13 + .../arm-template-blueprint.js | 1 - .../aws-blueprint/aws-blueprint.js | 1 - .../azure-blueprint/azure-blueprint.js | 1 - .../openstack-blueprint.js | 1 - .../vmware-blueprint/vmware-blueprint.js | 1 - server/app/model/blueprint/blueprint.js | 6 +- .../model/d4dmasters/d4dmastersmodelnew.js | 30 +- server/app/model/monitors/monitors.js | 4 +- server/app/routes/v1.0/routes_d4dMasters.js | 942 ++++++++++-------- server/app/routes/v1.0/routes_provider.js | 190 ++-- server/nbproject/project.properties | 4 + server/nbproject/project.xml | 9 + 13 files changed, 633 insertions(+), 570 deletions(-) create mode 100644 server/7VfjUZ6o5qcZGYwVngTiJZJ7.rb create mode 100644 server/nbproject/project.properties create mode 100644 server/nbproject/project.xml diff --git a/server/7VfjUZ6o5qcZGYwVngTiJZJ7.rb b/server/7VfjUZ6o5qcZGYwVngTiJZJ7.rb new file mode 100644 index 000000000..5be5bc878 --- /dev/null +++ b/server/7VfjUZ6o5qcZGYwVngTiJZJ7.rb @@ -0,0 +1,13 @@ +# See https://docs.chef.io/config_rb_knife.html for more information on knife configuration options + +current_dir = File.dirname(__FILE__) +log_level :info +log_location STDOUT +node_name "pcjoshi9" +client_key "#{current_dir}/pcjoshi9.pem" +validation_client_name "cat1-validator" +validation_key "#{current_dir}/cat1-validator.pem" +chef_server_url "https://api.opscode.com/organizations/cat1" +cache_type 'BasicFile' +cache_options( :path => "#{ENV['HOME']}/.chef/checksums" ) +cookbook_path ["#{current_dir}/../cookbooks"] diff --git a/server/app/model/blueprint/blueprint-types/arm-template-blueprint/arm-template-blueprint.js b/server/app/model/blueprint/blueprint-types/arm-template-blueprint/arm-template-blueprint.js index ae6136573..54908803d 100755 --- a/server/app/model/blueprint/blueprint-types/arm-template-blueprint/arm-template-blueprint.js +++ b/server/app/model/blueprint/blueprint-types/arm-template-blueprint/arm-template-blueprint.js @@ -166,7 +166,6 @@ ARMTemplateBlueprintSchema.methods.launch = function(launchParams, callback) { providerId: self.cloudProviderId, providerType: 'azure', tagServer: launchParams.tagServer, - monitorId: launchParams.monitorId, keyPairId: 'azure', region: self.region, chefNodeName: instanceData.name, diff --git a/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js b/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js index 1877cdd91..cd8aa5c0a 100755 --- a/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js +++ b/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js @@ -222,7 +222,6 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) { region: aKeyPair.region, chefNodeName: instanceData.InstanceId, tagServer: launchParams.tagServer, - monitorId: launchParams.monitorId, runlist: paramRunList, attributes: paramAttributes, platformId: instanceData.InstanceId, diff --git a/server/app/model/blueprint/blueprint-types/instance-blueprint/azure-blueprint/azure-blueprint.js b/server/app/model/blueprint/blueprint-types/instance-blueprint/azure-blueprint/azure-blueprint.js index c3a305077..3b56d2414 100755 --- a/server/app/model/blueprint/blueprint-types/instance-blueprint/azure-blueprint/azure-blueprint.js +++ b/server/app/model/blueprint/blueprint-types/instance-blueprint/azure-blueprint/azure-blueprint.js @@ -277,7 +277,6 @@ azureInstanceBlueprintSchema.methods.launch = function(launchParams, callback) { providerId: self.cloudProviderId, providerType: self.cloudProviderType, tagServer: launchParams.tagServer, - monitorId: launchParams.monitorId, keyPairId: 'azure', region: self.region, chefNodeName: launchparamsazure.VMName, diff --git a/server/app/model/blueprint/blueprint-types/instance-blueprint/openstack-blueprint/openstack-blueprint.js b/server/app/model/blueprint/blueprint-types/instance-blueprint/openstack-blueprint/openstack-blueprint.js index ce43efee8..65b26083a 100755 --- a/server/app/model/blueprint/blueprint-types/instance-blueprint/openstack-blueprint/openstack-blueprint.js +++ b/server/app/model/blueprint/blueprint-types/instance-blueprint/openstack-blueprint/openstack-blueprint.js @@ -224,7 +224,6 @@ openstackInstanceBlueprintSchema.methods.launch = function(launchParams, callbac providerId: self.cloudProviderId, providerType: self.cloudProviderType, tagServer: launchParams.tagServer, - monitorId: launchParams.monitorId, keyPairId: 'unknown', region: self.region, chefNodeName: instanceData.server.id, diff --git a/server/app/model/blueprint/blueprint-types/instance-blueprint/vmware-blueprint/vmware-blueprint.js b/server/app/model/blueprint/blueprint-types/instance-blueprint/vmware-blueprint/vmware-blueprint.js index b93066bdd..969017ab2 100755 --- a/server/app/model/blueprint/blueprint-types/instance-blueprint/vmware-blueprint/vmware-blueprint.js +++ b/server/app/model/blueprint/blueprint-types/instance-blueprint/vmware-blueprint/vmware-blueprint.js @@ -213,7 +213,6 @@ vmwareInstanceBlueprintSchema.methods.launch = function(launchParams, callback) providerId: self.cloudProviderId, providerType: self.cloudProviderType, tagServer: launchParams.tagServer, - monitorId: launchParams.monitorId, keyPairId: 'unknown', region: self.region, chefNodeName: createserverdata["vm_name"], diff --git a/server/app/model/blueprint/blueprint.js b/server/app/model/blueprint/blueprint.js index 9e16f6533..cce2cc60e 100755 --- a/server/app/model/blueprint/blueprint.js +++ b/server/app/model/blueprint/blueprint.js @@ -343,8 +343,7 @@ BlueprintSchema.methods.launch = function(opts, callback) { sessionUser: opts.sessionUser, users: self.users, blueprintData: self, - tagServer: opts.tagServer, - monitorId: opts.monitorId + tagServer: opts.tagServer }, function(err, launchData) { callback(err, launchData); }); @@ -368,8 +367,7 @@ BlueprintSchema.methods.launch = function(opts, callback) { sessionUser: opts.sessionUser, users: self.users, blueprintData: self, - tagServer: opts.tagServer, - monitorId: opts.monitorId + tagServer: opts.tagServer }, function(err, launchData) { callback(err, launchData); }); diff --git a/server/app/model/d4dmasters/d4dmastersmodelnew.js b/server/app/model/d4dmasters/d4dmastersmodelnew.js index 17e624703..234884a81 100755 --- a/server/app/model/d4dmasters/d4dmastersmodelnew.js +++ b/server/app/model/d4dmasters/d4dmastersmodelnew.js @@ -1,12 +1,12 @@ /* Copyright [2016] [Relevance Lab] - + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,12 +24,12 @@ var logger = require('_pr/logger')(module); var extend = require('mongoose-validator').extend; var Schema = mongoose.Schema; -extend('is_ValidName', function(val) { +extend('is_ValidName', function (val) { var pattern = /^[a-zA-Z0-9-_]+$/; return pattern.test(val); }, 'Name can contain alphabets, numbers,dash, underscore'); -extend('isValidDesc', function(val) { +extend('isValidDesc', function (val) { var pattern = /^[a-zA-Z0-9-_.,\s]+$/; return pattern.test(val); }, 'Name can contain alphabets, numbers,dash, underscore'); @@ -105,8 +105,8 @@ var d4dMastersOrg = new mongoose.Schema({ }, plannedCost: { type: Number, - required:false, - default:0.0 + required: false, + default: 0.0 }, active: { type: Boolean, @@ -379,9 +379,9 @@ var d4dMastersProjects = new mongoose.Schema({ default: true }, appdeploy: [{ - applicationname: String, - appdescription: String - }], + applicationname: String, + appdescription: String + }], repositories: { nexus: [String], docker: [String] @@ -472,6 +472,12 @@ var d4dMastersConfigManagement = new mongoose.Schema({ type: String, required: true, trim: true + }, + monitorId: { + type: String, + required: false, + trim: true, + default: null } }, { collection: 'd4dmastersnew' @@ -534,7 +540,7 @@ var d4dMastersDockerConfig = new mongoose.Schema({ required: false, trim: true }, - repositories:Schema.Types.Mixed, + repositories: Schema.Types.Mixed, folderpath: { type: String, trim: true @@ -1276,7 +1282,7 @@ var d4dMastersNexusServer = new mongoose.Schema({ required: false, trim: true }, - repositories:Schema.Types.Mixed, + repositories: Schema.Types.Mixed, orgrowid: { type: String, trim: true diff --git a/server/app/model/monitors/monitors.js b/server/app/model/monitors/monitors.js index 0214ed974..5a3a98f92 100644 --- a/server/app/model/monitors/monitors.js +++ b/server/app/model/monitors/monitors.js @@ -44,7 +44,7 @@ var MonitorsSchema = new Schema({ } }); -var hiddenFields = { '_id': 0, 'isDeleted': 0 }; +var hiddenFields = { 'isDeleted': 0 }; MonitorsSchema.statics.createNew = function createNew(data, callback) { var self = this; @@ -100,7 +100,7 @@ MonitorsSchema.statics.getById = function(monitorId, callback) { callback(null, null); return; } else { - return callback(null, monitors); + return callback(null, monitors[0]); } } ); diff --git a/server/app/routes/v1.0/routes_d4dMasters.js b/server/app/routes/v1.0/routes_d4dMasters.js index c31e50ef2..229712902 100755 --- a/server/app/routes/v1.0/routes_d4dMasters.js +++ b/server/app/routes/v1.0/routes_d4dMasters.js @@ -1,12 +1,12 @@ /* Copyright [2016] [Relevance Lab] - + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -46,14 +46,15 @@ var async = require('async'); var appDeployPipelineService = require('_pr/services/appDeployPipelineService'); var settingsService = require('_pr/services/settingsService'); var settingWizard = require('_pr/model/setting-wizard'); +var monitorsModel = require('_pr/model/monitors/monitors.js'); -module.exports.setRoutes = function(app, sessionVerification) { +module.exports.setRoutes = function (app, sessionVerification) { app.all('/d4dMasters/*', sessionVerification); // New implementation for docker authentication: Relevance Lab - app.post('/d4dmasters/docker/validate_old', function(req, res) { + app.post('/d4dmasters/docker/validate_old', function (req, res) { logger.debug("Docker credentials: ", JSON.stringify(req.body)); // dockerHubAPI.login(req.body.userName, req.body.password,function(info){ @@ -72,7 +73,7 @@ module.exports.setRoutes = function(app, sessionVerification) { // }); var curl = new Curl(); - curl.executecurl('curl --raw -L --user ' + req.body.username + ':' + req.body.password + ' https://index.docker.io/v1/users', function(err, resp) { + curl.executecurl('curl --raw -L --user ' + req.body.username + ':' + req.body.password + ' https://index.docker.io/v1/users', function (err, resp) { var loggedin = false; if (!err) { if (resp.indexOf('OK') > 0) { @@ -121,7 +122,7 @@ module.exports.setRoutes = function(app, sessionVerification) { // }); }); - app.post('/d4dmasters/docker/validate', function(req, res) { + app.post('/d4dmasters/docker/validate', function (req, res) { logger.debug("Docker crudentials: ", JSON.stringify(req.body)); var userName = req.body.userName; var password = req.body.password; @@ -133,7 +134,7 @@ module.exports.setRoutes = function(app, sessionVerification) { client = new Client(options_auth); var dockerUrl = 'https://index.docker.io/v1/users'; client.registerMethod("jsonMethod", dockerUrl, "GET"); - var reqSubmit = client.methods.jsonMethod(function(data, response) { + var reqSubmit = client.methods.jsonMethod(function (data, response) { logger.debug("response: ", response); logger.debug("data: ", JSON.stringify(data)); res.send('200'); @@ -141,7 +142,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); // Handling Exception for nexus req. - reqSubmit.on('error', function(err) { + reqSubmit.on('error', function (err) { logger.debug('Something went wrong on req!!', err.request.options); res.send('402'); }); @@ -149,10 +150,10 @@ module.exports.setRoutes = function(app, sessionVerification) { // Used npm library instead of curl to check ip is alive or not: Relevance Lab - app.get('/d4dmasters/instanceping/:ip', function(req, res) { + app.get('/d4dmasters/instanceping/:ip', function (req, res) { logger.debug("Enter get() for /d4dmasters/instanceping/%s", req.params.ip); // make sure 22 port should be open for all instances. - waitForPort(req.params.ip, 22, function(err) { + waitForPort(req.params.ip, 22, function (err) { if (err) { logger.error("Error to ping ip: ", err); res.status(500).send('Not Alive'); @@ -162,12 +163,12 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); //d4dmasters/getdockertags/centos/null - app.get('/d4dmasters/getdockertags/:repopath/:dockerreponame', function(req, res) { + app.get('/d4dmasters/getdockertags/:repopath/:dockerreponame', function (req, res) { logger.debug("Enter get() for /d4dmasters/getdockertags/%s/%s", req.params.repopath, req.params.dockerreponame); //fetch the username and password from //Need to populate dockerrowid in template card. - done logger.debug('hit getdockertags'); - configmgmtDao.getMasterRow(18, 'dockerreponame', req.params.dockerreponame, function(err, data) { + configmgmtDao.getMasterRow(18, 'dockerreponame', req.params.dockerreponame, function (err, data) { if (!err) { logger.debug('data rcvd:' + data == ''); logger.debug(data); @@ -195,14 +196,14 @@ module.exports.setRoutes = function(app, sessionVerification) { //https://index.docker.io/v1/repositories/ logger.debug('dockerurl:' + dockerUrl); client.registerMethod("jsonMethod", dockerUrl, "GET"); - var reqSubmit = client.methods.jsonMethod(function(data, response) { + var reqSubmit = client.methods.jsonMethod(function (data, response) { console.log("response: ", data); res.send(JSON.stringify(data)); return; }); // Handling Exception for nexus req. - reqSubmit.on('error', function(err) { + reqSubmit.on('error', function (err) { logger.debug('Something went wrong on req!!', err, err.request.options); res.send('402'); }); @@ -217,21 +218,21 @@ module.exports.setRoutes = function(app, sessionVerification) { }); - app.get('/d4dMasters/mastersjson', function(req, res) { + app.get('/d4dMasters/mastersjson', function (req, res) { logger.debug("Enter get() for /d4dMasters/mastersjson"); res.send([{ - name: 'master' - }, { - name: 'master2' - }]); + name: 'master' + }, { + name: 'master2' + }]); logger.debug("Exit get() for /d4dMasters/mastersjson"); }); //getAccessFilesForRole - app.get('/d4dMasters/getaccessroles/:loginname', function(req, res) { + app.get('/d4dMasters/getaccessroles/:loginname', function (req, res) { logger.debug("Enter get() for /d4dMasters/getaccessroles/%s", req.params.loginname); var authorizedFiles = req.session.user.authorizedfiles; var loggedInUser = req.params.loginname; - configmgmtDao.getAccessFilesForRole(loggedInUser, req, res, function(err, getAccessFiles) { + configmgmtDao.getAccessFilesForRole(loggedInUser, req, res, function (err, getAccessFiles) { if (getAccessFiles) { getAccessFiles = getAccessFiles.replace(/\"/g, '').replace(/\:/g, '') logger.debug("Rcvd in call: %s", getAccessFiles); @@ -242,9 +243,9 @@ module.exports.setRoutes = function(app, sessionVerification) { logger.debug("Exit get() for /d4dMasters/getaccessroles/%s", req.params.loginname); }); - app.get('/d4dMasters/getcodelist/:name', function(req, res) { + app.get('/d4dMasters/getcodelist/:name', function (req, res) { logger.debug("Enter get() for /d4dMasters/getcodelist/%s", req.params.name); - configmgmtDao.getCodeList(req.params.name, function(err, cl) { + configmgmtDao.getCodeList(req.params.name, function (err, cl) { if (cl) { logger.debug("Closing"); res.end(cl); @@ -253,20 +254,20 @@ module.exports.setRoutes = function(app, sessionVerification) { logger.debug("Exit get() for /d4dMasters/getcodelist/%s", req.params.name); }); - app.get('/d4dMasters/getuser', function(req, res) { + app.get('/d4dMasters/getuser', function (req, res) { logger.debug("Enter get() for /d4dMasters/getuser : " + JSON.stringify(req.session.user)); res.send({ "user": [{ - username: req.session.user - }, { - role: '[' + req.session.user.roleId + ']' - }] + username: req.session.user + }, { + role: '[' + req.session.user.roleId + ']' + }] }); logger.debug("Exit get() for /d4dMasters/getuser"); }); // Get the current loggedin user details with permissionset and authorized files - app.get('/d4dMasters/loggedin/user', function(req, res) { + app.get('/d4dMasters/loggedin/user', function (req, res) { if (req.session.user) { var pSet = req.session.user.permissionset; if (pSet.length > 1) { @@ -297,33 +298,33 @@ module.exports.setRoutes = function(app, sessionVerification) { }); - app.get('/d4dMasters/authorizedfiles', function(req, res) { + app.get('/d4dMasters/authorizedfiles', function (req, res) { logger.debug("Enter get() for /d4dMasters/authorizedfiles"); res.send('[' + req.session.user.authorizedfiles + ']'); logger.debug("Exit get() for /d4dMasters/authorizedfiles"); }); - app.get('/d4dMasters/setting', function(req, res) { - configmgmtDao.getTeamsOrgBuProjForUser(req.session.user.cn, function(err, data) { + app.get('/d4dMasters/setting', function (req, res) { + configmgmtDao.getTeamsOrgBuProjForUser(req.session.user.cn, function (err, data) { logger.debug('Retuened setting : ' + data); res.send(200); }); }); - app.get('/d4dMasters/removeitem/:id/:fieldname/:fieldvalue', function(req, res) { + app.get('/d4dMasters/removeitem/:id/:fieldname/:fieldvalue', function (req, res) { logger.debug("Received request for delete chk. %s : %s : %s", req.params.fieldvalue, req.params.id, req.params.fieldname); // logger.debug('received request ' + req.params.id); logger.debug('Verifying User permission set for delete.'); var user = req.session.user; var category = configmgmtDao.getCategoryFromID(req.params.id); var permissionto = 'delete'; - usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) { + usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function (err, data) { if (err) { logger.error("Hit and error in haspermission:", err); res.send(500); return; } - masterUtil.getLoggedInUser(user.cn, function(err, anUser) { + masterUtil.getLoggedInUser(user.cn, function (err, anUser) { if (err) { res.status(500).send("Failed to fetch User."); } @@ -331,88 +332,88 @@ module.exports.setRoutes = function(app, sessionVerification) { var toCheck = []; switch (req.params.id) { case "1": - toCheck.push({id:'10', - errMsg:'Organization is associated with Chef-Server.To delete organization please delete respective Chef-Server first.', - fieldName:'orgname_rowid' + toCheck.push({id: '10', + errMsg: 'Organization is associated with Chef-Server.To delete organization please delete respective Chef-Server first.', + fieldName: 'orgname_rowid' }); - toCheck.push({id:'3', - errMsg:'Organization is associated with some Environments.To delete organization please delete respective Environments first.', - fieldName:'orgname_rowid' + toCheck.push({id: '3', + errMsg: 'Organization is associated with some Environments.To delete organization please delete respective Environments first.', + fieldName: 'orgname_rowid' }); - toCheck.push({id:'2', - errMsg:'Organization is associated with some Business Groups.To delete organization please delete respective Business Groups first.', - fieldName:'orgname_rowid' + toCheck.push({id: '2', + errMsg: 'Organization is associated with some Business Groups.To delete organization please delete respective Business Groups first.', + fieldName: 'orgname_rowid' }); break; case "2": - toCheck.push({id:'4', - errMsg:'Business Group is associated with some Projects.To delete business group please delete respective Projects first.', - fieldName:'productgroupname_rowid' + toCheck.push({id: '4', + errMsg: 'Business Group is associated with some Projects.To delete business group please delete respective Projects first.', + fieldName: 'productgroupname_rowid' }); break; case "3": - toCheck.push({id:'4', - errMsg:'Environment is associated with some Projects.To delete business group please delete respective Projects first.', - fieldName:'environmentname_rowid,orgname_rowid' + toCheck.push({id: '4', + errMsg: 'Environment is associated with some Projects.To delete business group please delete respective Projects first.', + fieldName: 'environmentname_rowid,orgname_rowid' }); break; case "4": - toCheck.push({id:'instances', - errMsg:'Project is associated with some Instances.To delete Project please delete respective instances first.', - fieldName:'projectId' + toCheck.push({id: 'instances', + errMsg: 'Project is associated with some Instances.To delete Project please delete respective instances first.', + fieldName: 'projectId' }); - toCheck.push({id:'blueprints', - errMsg:'Project is associated with some Blueprints.To delete Project please delete respective blueprints first.', - fieldName:'projectId' + toCheck.push({id: 'blueprints', + errMsg: 'Project is associated with some Blueprints.To delete Project please delete respective blueprints first.', + fieldName: 'projectId' }); break; case "10": - toCheck.push({id:'instances', - errMsg:'Chef-Server already used by Some Instances.To delete Chef-Server please delete respective instances first.', - fieldName:'configname_rowid' + toCheck.push({id: 'instances', + errMsg: 'Chef-Server already used by Some Instances.To delete Chef-Server please delete respective instances first.', + fieldName: 'configname_rowid' }); - toCheck.push({id:'3', - errMsg:'Chef-Server already used by Some Enviornments.To delete Chef-Server please delete respective enviornments first.', - fieldName : 'configname_rowid' + toCheck.push({id: '3', + errMsg: 'Chef-Server already used by Some Enviornments.To delete Chef-Server please delete respective enviornments first.', + fieldName: 'configname_rowid' }); - + break; case "19": - toCheck.push({id:'instances', - errMsg:'Project is associated with some Instances.To delete Project please delete respective instances first.', - fieldName:'projectId' + toCheck.push({id: 'instances', + errMsg: 'Project is associated with some Instances.To delete Project please delete respective instances first.', + fieldName: 'projectId' }); - toCheck.push({id:'blueprints', - errMsg:'Project is associated with some Blueprints.To delete Project please delete respective blueprints first.', - fieldName:'projectId' + toCheck.push({id: 'blueprints', + errMsg: 'Project is associated with some Blueprints.To delete Project please delete respective blueprints first.', + fieldName: 'projectId' }); break; } - masterUtil.getTemplateTypesById(req.params.fieldvalue, function(err, templateTypeData) { + masterUtil.getTemplateTypesById(req.params.fieldvalue, function (err, templateTypeData) { if (err) { res.status(500).send("Error from DB"); return; } if (templateTypeData.length > 0) { - blueprintsDao.getBlueprintByTemplateType(templateTypeData[0].templatetypename, function(err, bpData) { + blueprintsDao.getBlueprintByTemplateType(templateTypeData[0].templatetypename, function (err, bpData) { if (err) { res.status(500).send("Error from DB."); return; } - configmgmtDao.deleteCheck(req.params.fieldvalue, toCheck, function(err, data) { - if(err){ - if(err.errCode === 500){ + configmgmtDao.deleteCheck(req.params.fieldvalue, toCheck, function (err, data) { + if (err) { + if (err.errCode === 500) { res.status(500).send(err.errMsg); return; - }else{ + } else { logger.debug("There are dependent elements which are not deleted"); res.send(412, err.errMsg); return; } - }else{ + } else { logger.debug("entering delete"); - configmgmtDao.getDBModelFromID(req.params.id, function(err, dbtype) { + configmgmtDao.getDBModelFromID(req.params.id, function (err, dbtype) { if (err) { logger.debug("Hit and error:", err); } @@ -421,7 +422,7 @@ module.exports.setRoutes = function(app, sessionVerification) { logger.debug("About to delete Master Type: %s : % : %", dbtype, item, req.params.fieldvalue); eval('d4dModelNew.' + dbtype).remove({ rowid: req.params.fieldvalue - }, function(err) { + }, function (err) { if (err) { logger.debug("Hit an errror on delete : %s", err); res.send(500); @@ -435,29 +436,29 @@ module.exports.setRoutes = function(app, sessionVerification) { } }); //end configmgmtDao } - }); + }); }); } else { - configmgmtDao.deleteCheck(req.params.fieldvalue, toCheck, function(err, data) { - if(err){ - if(err.errCode === 500){ + configmgmtDao.deleteCheck(req.params.fieldvalue, toCheck, function (err, data) { + if (err) { + if (err.errCode === 500) { res.status(500).send(err.errMsg); return; - }else{ + } else { logger.debug("There are dependent elements which are not deleted"); res.send(412, err.errMsg); return; } - }else{ + } else { logger.debug("entering delete"); - configmgmtDao.getDBModelFromID(req.params.id, function(err, dbtype) { + configmgmtDao.getDBModelFromID(req.params.id, function (err, dbtype) { if (err) { logger.debug("Hit and error:", err); } if (dbtype) { var item = '\"' + req.params.fieldname + '\"'; logger.debug("About to delete Master Type: %s : % : %", dbtype, item, req.params.fieldvalue); - if(req.params.id === '3') { + if (req.params.id === '3') { masterUtil.getEnvironmentByEnvId(req.params.fieldvalue, function (err, environment) { if (err) { logger.debug("Hit an errror to get Environment Name : %s", err); @@ -471,13 +472,13 @@ module.exports.setRoutes = function(app, sessionVerification) { logger.debug("Hit an errror on delete : %s", err); res.send(500); return; - }else { - settingsService.trackSettingWizard(req.params.id,environment.orgname_rowid,function(err,results){ + } else { + settingsService.trackSettingWizard(req.params.id, environment.orgname_rowid, function (err, results) { if (err) { logger.debug("Hit an error on updating the setting wixards Data : %s", err); res.send(500); return; - }else { + } else { settingsService.updateProjectData(environment, function (err, projectData) { if (err) { logger.debug("Hit an error on updating the Project Master Data : %s", err); @@ -501,10 +502,10 @@ module.exports.setRoutes = function(app, sessionVerification) { }); //end findOne } }) - }else{ + } else { eval('d4dModelNew.' + dbtype).findOne({ rowid: req.params.fieldvalue - }, function (err,data) { + }, function (err, data) { if (err) { logger.debug("Hit an errror on fetching data : %s", err); res.send(500); @@ -518,21 +519,21 @@ module.exports.setRoutes = function(app, sessionVerification) { res.send(500); return; } else { - var orgId =''; - if(req.params.id === '1'){ + var orgId = ''; + if (req.params.id === '1') { orgId = data.rowid; - }else if(data.orgname_rowid.length ===1){ + } else if (data.orgname_rowid.length === 1) { orgId = data.orgname_rowid[0]; - }else{ + } else { orgId = data.orgname_rowid; } - settingsService.trackSettingWizard(req.params.id,orgId,function(err,results){ + settingsService.trackSettingWizard(req.params.id, orgId, function (err, results) { if (err) { logger.debug("Hit an errror on delete : %s", err); res.send(500); return; - }else { + } else { logger.debug("Document deleted : %s", req.params.fieldvalue); res.send(200); logger.debug("Exit get() for /d4dMasters/removeitem/%s/%s/%s", req.params.id, req.params.fieldname, req.params.fieldvalue); @@ -558,16 +559,16 @@ module.exports.setRoutes = function(app, sessionVerification) { }); //Reading a icon file saved - app.get('/d4dMasters/image/:imagename', function(req, res) { + app.get('/d4dMasters/image/:imagename', function (req, res) { logger.debug("Enter get() for /d4dMasters/image/%s", req.params.imagename); var settings = appConfig.chef; var chefRepoPath = settings.chefReposLocation; logger.debug(chefRepoPath); var file = chefRepoPath + 'catalyst_files/' + req.params.imagename; logger.debug(file); - fs.exists(file, function(exists) { + fs.exists(file, function (exists) { if (exists) { - fs.readFile(chefRepoPath + 'catalyst_files/' + req.params.imagename, function(err, data) { + fs.readFile(chefRepoPath + 'catalyst_files/' + req.params.imagename, function (err, data) { if (err) { res.end(404); return; @@ -583,11 +584,11 @@ module.exports.setRoutes = function(app, sessionVerification) { }); logger.debug("Exit get() for /d4dMasters/image/%s", req.params.imagename); }); - app.get('/d4dMasters/readmasterjson/:id', function(req, res) { + app.get('/d4dMasters/readmasterjson/:id', function (req, res) { logger.debug("Enter get() for /d4dMasters/readmasterjson/%s", req.params.id); d4dModel.findOne({ id: req.params.id - }, function(err, d4dMasterJson) { + }, function (err, d4dMasterJson) { if (err) { logger.error("Hit and error:", err); } @@ -608,10 +609,10 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/d4dMasters/readmasterjsonrecord/:id/:rowid', function(req, res) { + app.get('/d4dMasters/readmasterjsonrecord/:id/:rowid', function (req, res) { logger.debug("Enter get() for /d4dMasters/readmasterjsonrecord/%s/%s", req.params.id, req.params.rowid); - configmgmtDao.getRowids(function(err, rowidlist) { - configmgmtDao.getDBModelFromID(req.params.id, function(err, dbtype) { + configmgmtDao.getRowids(function (err, rowidlist) { + configmgmtDao.getDBModelFromID(req.params.id, function (err, dbtype) { if (err) { logger.error("Hit and error:", err); } @@ -619,7 +620,7 @@ module.exports.setRoutes = function(app, sessionVerification) { logger.debug("Master Type: %s", dbtype) eval('d4dModelNew.' + dbtype).findOne({ rowid: req.params.rowid - }, function(err, d4dMasterJson) { + }, function (err, d4dMasterJson) { if (err) { logger.error("Hit and error:", err); } @@ -650,7 +651,14 @@ module.exports.setRoutes = function(app, sessionVerification) { d4dMasterJson[flds[0]] = names; //configmgmtDao.convertRowIDToValue(jobj[k1],rowidlist); } } - res.end(JSON.stringify(d4dMasterJson)); + if (req.params.id === '10') { + getMonitorDetail(d4dMasterJson, function (data) { + d4dMasterJson = data; + res.end(JSON.stringify(d4dMasterJson)); + }); + } else { + res.end(JSON.stringify(d4dMasterJson)); + } logger.debug("sent response %s", JSON.stringify(d4dMasterJson)); logger.debug("Exit get() for /d4dMasters/readmasterjsonrecord/%s/%s", req.params.id, req.params.rowid); } else { @@ -666,11 +674,11 @@ module.exports.setRoutes = function(app, sessionVerification) { }); - app.get('/d4dMasters/readmasterjsonnew__/:id', function(req, res) { + app.get('/d4dMasters/readmasterjsonnew__/:id', function (req, res) { logger.debug("Enter get() for /d4dMasters/readmasterjsonnew__/%s", req.params.id); d4dModelNew.d4dModelMastersOrg.find({ id: req.params.id - }, function(err, d4dMasterJson) { + }, function (err, d4dMasterJson) { if (err) { logger.debug("Hit and error:", err); } @@ -690,12 +698,12 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/d4dMasters/readmasterjsonnew/:id', function(req, res) { + app.get('/d4dMasters/readmasterjsonnew/:id', function (req, res) { logger.debug("Enter get() for /d4dMasters/readmasterjsonnew/%s", req.params.id); logger.debug("Logged in user: ", req.session.user.cn); logger.debug("incomming id: ", req.params.id); var loggedInUser = req.session.user.cn; - masterUtil.getLoggedInUser(loggedInUser, function(err, anUser) { + masterUtil.getLoggedInUser(loggedInUser, function (err, anUser) { if (err) { res.status(500).send("Failed to fetch User."); return; @@ -706,7 +714,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } if (anUser.orgname_rowid[0] === "") { // For Org - masterUtil.getAllActiveOrg(function(err, orgList) { + masterUtil.getAllActiveOrg(function (err, orgList) { logger.debug("got org list ==>", JSON.stringify(orgList)); if (err) { res.status(500).send('Not able to fetch Orgs.'); @@ -715,7 +723,7 @@ module.exports.setRoutes = function(app, sessionVerification) { if (orgList.length === 0 && req.params.id === '21') { d4dModelNew.d4dModelMastersTeams.find({ id: "21" - }, function(err, data) { + }, function (err, data) { if (err) { logger.error("Failed to fetch Team."); } @@ -726,7 +734,7 @@ module.exports.setRoutes = function(app, sessionVerification) { return; } else if (req.params.id === '2') { // For BusinessGroup - masterUtil.getBusinessGroups(orgList, function(err, bgList) { + masterUtil.getBusinessGroups(orgList, function (err, bgList) { if (err) { res.status(500).send('Not able to fetch BG.'); } @@ -735,7 +743,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); } else if (req.params.id === '3') { // For Environment - masterUtil.getEnvironments(orgList, function(err, envList) { + masterUtil.getEnvironments(orgList, function (err, envList) { if (err) { res.status(500).send('Not able to fetch ENV.'); } @@ -744,7 +752,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); } else if (req.params.id === '4') { // For Projects - masterUtil.getProjects(orgList, function(err, projectList) { + masterUtil.getProjects(orgList, function (err, projectList) { if (err) { res.status(500).send('Not able to fetch Project.'); } @@ -753,18 +761,28 @@ module.exports.setRoutes = function(app, sessionVerification) { }) } else if (req.params.id === '10') { // For ConfigManagement - masterUtil.getCongifMgmts(orgList, function(err, configMgmtList) { + masterUtil.getCongifMgmts(orgList, function (err, configMgmtList) { + logger.debug("chef server list2 ==>", JSON.stringify(configMgmtList)); if (err) { res.status(500).send('Not able to fetch ConfigManagement.'); } - res.send(configMgmtList); - return; + var response = []; + for (var i = 0; i < configMgmtList.length; i++) { + getMonitorDetail(configMgmtList[i], function (data) { + response.push(data); + if (response.length === configMgmtList.length) { + res.send(response); + return; + } + }); + } + }); } else if (req.params.id === '18') { // For Docker logger.debug("Id for docker: ", req.params.id); - masterUtil.getDockers(orgList, function(err, dockerList) { + masterUtil.getDockers(orgList, function (err, dockerList) { if (err) { res.status(500).send('Not able to fetch Dockers.'); } @@ -775,7 +793,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } else if (req.params.id === '17') { // For Template logger.debug("Id for template: ", req.params.id); - masterUtil.getTemplates(orgList, function(err, templateList) { + masterUtil.getTemplates(orgList, function (err, templateList) { if (err) { res.status(500).send('Not able to fetch Template.'); } @@ -786,7 +804,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } else if (req.params.id === '16') { // For Template logger.debug("Id for templateType: ", req.params.id); - masterUtil.getTemplateTypes(orgList, function(err, templateList) { + masterUtil.getTemplateTypes(orgList, function (err, templateList) { if (err) { res.status(500).send('Not able to fetch TemplateType.'); } @@ -795,7 +813,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); } else if (req.params.id === '19') { // For ServiceCommand - masterUtil.getServiceCommands(orgList, function(err, serviceCommandList) { + masterUtil.getServiceCommands(orgList, function (err, serviceCommandList) { if (err) { res.status(500).send('Not able to fetch ServiceCommand.'); } @@ -805,7 +823,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } else if (req.params.id === '20') { // For Jenkins - masterUtil.getJenkins(orgList, function(err, jenkinList) { + masterUtil.getJenkins(orgList, function (err, jenkinList) { if (err) { res.status(500).send('Not able to fetch Jenkins.'); } @@ -815,7 +833,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } else if (req.params.id === '6') { // For User Role - masterUtil.getUserRoles(function(err, userRoleList) { + masterUtil.getUserRoles(function (err, userRoleList) { if (err) { res.status(500).send('Not able to fetch UserRole.'); } @@ -825,7 +843,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } else if (req.params.id === '7') { // For User - masterUtil.getUsersForOrgOrAll(orgList, function(err, userList) { + masterUtil.getUsersForOrgOrAll(orgList, function (err, userList) { if (err) { res.status(500).send('Not able to fetch User.'); } @@ -835,7 +853,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } else if (req.params.id === '21') { // For Team - masterUtil.getTeams(orgList, function(err, teamList) { + masterUtil.getTeams(orgList, function (err, teamList) { if (err) { res.status(500).send('Not able to fetch Team.'); } @@ -844,7 +862,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); } else if (req.params.id === '25') { // For Puppet Server - masterUtil.getPuppetServers(orgList, function(err, pList) { + masterUtil.getPuppetServers(orgList, function (err, pList) { if (err) { res.status(500).send('Not able to fetch Puppet Server.'); } @@ -854,7 +872,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } else if (req.params.id === '26') { // For Puppet Server - masterUtil.getNexusServers(orgList, function(err, pList) { + masterUtil.getNexusServers(orgList, function (err, pList) { if (err) { res.status(500).send('Not able to fetch Nexus Server.'); } @@ -871,7 +889,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } else { logger.debug("incomming id: ", req.params.id); // For Org - masterUtil.getOrgs(loggedInUser, function(err, orgList) { + masterUtil.getOrgs(loggedInUser, function (err, orgList) { logger.debug("got org list: ", JSON.stringify(orgList)); if (err) { res.status(500).send('Not able to fetch Orgs.'); @@ -881,7 +899,7 @@ module.exports.setRoutes = function(app, sessionVerification) { return; } else if (req.params.id === '2') { // For BusinessGroup - masterUtil.getBusinessGroups(orgList, function(err, bgList) { + masterUtil.getBusinessGroups(orgList, function (err, bgList) { if (err) { res.status(500).send('Not able to fetch BG.'); } @@ -890,7 +908,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); } else if (req.params.id === '3') { // For Environment - masterUtil.getEnvironments(orgList, function(err, envList) { + masterUtil.getEnvironments(orgList, function (err, envList) { if (err) { res.status(500).send('Not able to fetch ENV.'); } @@ -899,7 +917,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); } else if (req.params.id === '4') { // For Projects - masterUtil.getProjects(orgList, function(err, projectList) { + masterUtil.getProjects(orgList, function (err, projectList) { if (err) { res.status(500).send('Not able to fetch Project.'); } @@ -908,18 +926,27 @@ module.exports.setRoutes = function(app, sessionVerification) { }) } else if (req.params.id === '10') { // For ConfigManagement - masterUtil.getCongifMgmts(orgList, function(err, configMgmtList) { + masterUtil.getCongifMgmts(orgList, function (err, configMgmtList) { + logger.debug("chef server list2 ==>", JSON.stringify(configMgmtList)); if (err) { res.status(500).send('Not able to fetch ConfigManagement.'); } - res.send(configMgmtList); - return; + var response = []; + for (var i = 0; i < configMgmtList.length; i++) { + getMonitorDetail(configMgmtList[i], function (data) { + response.push(data); + if (response.length === configMgmtList.length) { + res.send(response); + return; + } + }); + } }); } else if (req.params.id === '18') { // For Docker logger.debug("Id for docker: ", req.params.id); - masterUtil.getDockers(orgList, function(err, dockerList) { + masterUtil.getDockers(orgList, function (err, dockerList) { if (err) { res.status(500).send('Not able to fetch Dockers.'); } @@ -930,7 +957,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } else if (req.params.id === '17') { // For Template logger.debug("Id for template: ", req.params.id); - masterUtil.getTemplates(orgList, function(err, templateList) { + masterUtil.getTemplates(orgList, function (err, templateList) { if (err) { res.status(500).send('Not able to fetch Template.'); } @@ -941,7 +968,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } else if (req.params.id === '16') { // For Template logger.debug("Id for templateType: ", req.params.id); - masterUtil.getTemplateTypes(orgList, function(err, templateList) { + masterUtil.getTemplateTypes(orgList, function (err, templateList) { if (err) { res.status(500).send('Not able to fetch TemplateType.'); } @@ -951,7 +978,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } else if (req.params.id === '19') { // For ServiceCommand - masterUtil.getServiceCommands(orgList, function(err, serviceCommandList) { + masterUtil.getServiceCommands(orgList, function (err, serviceCommandList) { if (err) { res.status(500).send('Not able to fetch ServiceCommand.'); } @@ -961,7 +988,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } else if (req.params.id === '20') { // For Jenkins - masterUtil.getJenkins(orgList, function(err, jenkinList) { + masterUtil.getJenkins(orgList, function (err, jenkinList) { if (err) { res.status(500).send('Not able to fetch Jenkins.'); } @@ -971,7 +998,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } else if (req.params.id === '6') { // For User Role - masterUtil.getUserRoles(function(err, userRoleList) { + masterUtil.getUserRoles(function (err, userRoleList) { if (err) { res.status(500).send('Not able to fetch UserRole.'); } @@ -981,7 +1008,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } else if (req.params.id === '7') { // For User - masterUtil.getUsersForOrg(orgList, function(err, userList) { + masterUtil.getUsersForOrg(orgList, function (err, userList) { if (err) { res.status(500).send('Not able to fetch User.'); } @@ -991,7 +1018,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } else if (req.params.id === '21') { // For Team - masterUtil.getTeams(orgList, function(err, teamList) { + masterUtil.getTeams(orgList, function (err, teamList) { if (err) { res.status(500).send('Not able to fetch Team.'); } @@ -1000,7 +1027,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); } else if (req.params.id === '25') { // For Puppet Server - masterUtil.getPuppetServers(orgList, function(err, pList) { + masterUtil.getPuppetServers(orgList, function (err, pList) { if (err) { res.status(500).send('Not able to fetch Puppet Server.'); } @@ -1009,7 +1036,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); } else if (req.params.id === '26') { // For Puppet Server - masterUtil.getNexusServers(orgList, function(err, pList) { + masterUtil.getNexusServers(orgList, function (err, pList) { if (err) { res.status(500).send('Not able to fetch Nexus Server.'); } @@ -1026,10 +1053,10 @@ module.exports.setRoutes = function(app, sessionVerification) { }); - app.get('/d4dMasters/readmasterjsonneworglist/:id', function(req, res) { + app.get('/d4dMasters/readmasterjsonneworglist/:id', function (req, res) { logger.debug("Enter get() for /d4dMasters/readmasterjsonneworglist/%s", req.params.id); var loggedInUser = req.session.user.cn; - masterUtil.getLoggedInUser(loggedInUser, function(err, anUser) { + masterUtil.getLoggedInUser(loggedInUser, function (err, anUser) { if (err) { res.status(500).send("Failed to fetch User."); } @@ -1037,8 +1064,8 @@ module.exports.setRoutes = function(app, sessionVerification) { res.status(500).send("Invalid User."); } if (anUser.orgname_rowid[0] === "") { - configmgmtDao.getRowids(function(err, rowidlist) { - configmgmtDao.getDBModelFromID(req.params.id, function(err, dbtype) { + configmgmtDao.getRowids(function (err, rowidlist) { + configmgmtDao.getDBModelFromID(req.params.id, function (err, dbtype) { if (err) { logger.error("Hit and error:", err); } @@ -1055,7 +1082,7 @@ module.exports.setRoutes = function(app, sessionVerification) { eval('d4dModelNew.' + dbtype).find({ id: req.params.id - }, function(err, d4dMasterJson) { + }, function (err, d4dMasterJson) { if (err) { logger.debug("Hit and error:", err); } @@ -1103,7 +1130,8 @@ module.exports.setRoutes = function(app, sessionVerification) { } logger.debug("Orgname check: %s", d4dMasterJson[k]['orgname']); counter++; - }; + } + ; logger.debug("To Delete Array: %s", todelete.toString()); var collection = []; for (var i = 0; i < d4dMasterJson.length; i++) { @@ -1120,7 +1148,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); //rowidlist } else { // For non-catalystadmin - masterUtil.getOrgs(loggedInUser, function(err, orgList) { + masterUtil.getOrgs(loggedInUser, function (err, orgList) { if (orgList) { logger.debug("Returned Org List: ", JSON.stringify(orgList)); res.send(orgList); @@ -1130,18 +1158,18 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/d4dMasters/readmasterjsonnewk_/:id', function(req, res) { + app.get('/d4dMasters/readmasterjsonnewk_/:id', function (req, res) { logger.debug("Enter get() for /d4dMasters/readmasterjsonnewk_/%s", req.params.id); - configmgmtDao.getRowids(function(err, rowidlist) { + configmgmtDao.getRowids(function (err, rowidlist) { logger.debug("Rowid List: ", rowidlist); d4dModelNew.d4dModelMastersOrg.find({ id: 1 - }, function(err, docorgs) { - var orgnames = docorgs.map(function(docorgs1) { + }, function (err, docorgs) { + var orgnames = docorgs.map(function (docorgs1) { return docorgs1.rowid; }); if (req.params.id == '2' || req.params.id == '3' || req.params.id == '10') { - configmgmtDao.getDBModelFromID(req.params.id, function(err, dbtype) { + configmgmtDao.getDBModelFromID(req.params.id, function (err, dbtype) { if (err) { logger.error("Hit and error:", err); } @@ -1152,13 +1180,13 @@ module.exports.setRoutes = function(app, sessionVerification) { orgname_rowid: { $in: orgnames } - }, function(err, d4dMasterJson) { + }, function (err, d4dMasterJson) { if (err) { logger.error("Hit and error:", err); } //Need to iterate thru the json and find if there is a field with _rowid then convert it to prefix before sending. var _keys = Object.keys(d4dMasterJson); - _keys.forEach(function(k, v) { + _keys.forEach(function (k, v) { var jobj = JSON.parse(JSON.stringify(d4dMasterJson[k])); for (var k1 in jobj) { if (k1.indexOf('_rowid')) { @@ -1181,11 +1209,11 @@ module.exports.setRoutes = function(app, sessionVerification) { rowid: { $in: orgnames } - }, function(err, docbgs) { - var bgnames = docbgs.map(function(docbgs1) { + }, function (err, docbgs) { + var bgnames = docbgs.map(function (docbgs1) { return docbgs1.productgroupname; }); - configmgmtDao.getDBModelFromID(req.params.id, function(err, dbtype) { + configmgmtDao.getDBModelFromID(req.params.id, function (err, dbtype) { if (err) { logger.error("Hit and error:", err); } @@ -1196,7 +1224,7 @@ module.exports.setRoutes = function(app, sessionVerification) { productgroupname: { $in: bgnames } - }, function(err, d4dMasterJson) { + }, function (err, d4dMasterJson) { if (err) { logger.error("Hit and error:", err); } @@ -1206,7 +1234,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); } else { - configmgmtDao.getDBModelFromID(req.params.id, function(err, dbtype) { + configmgmtDao.getDBModelFromID(req.params.id, function (err, dbtype) { if (err) { logger.error("Hit and error:", err); } @@ -1214,7 +1242,7 @@ module.exports.setRoutes = function(app, sessionVerification) { logger.debug("Master Type: %s", dbtype); eval('d4dModelNew.' + dbtype).find({ id: req.params.id - }, function(err, d4dMasterJson) { + }, function (err, d4dMasterJson) { if (err) { logger.error("Hit and error:", err); } @@ -1228,13 +1256,13 @@ module.exports.setRoutes = function(app, sessionVerification) { }); - app.get('/d4dMasters/readmasterjsoncounts', function(req, res) { + app.get('/d4dMasters/readmasterjsoncounts', function (req, res) { logger.debug("Enter get() for /d4dMasters/readmasterjsoncounts"); logger.debug("Logged in User: ", req.session.user.cn); var ret = []; var masts = ['2', '3', '4']; var counts = []; - masterUtil.getLoggedInUser(req.session.user.cn, function(err, anUser) { + masterUtil.getLoggedInUser(req.session.user.cn, function (err, anUser) { if (err) { res.status(500).send("Failed to fetch User."); } @@ -1247,8 +1275,8 @@ module.exports.setRoutes = function(app, sessionVerification) { d4dModelNew.d4dModelMastersOrg.find({ id: 1, active: true - }, function(err, docorgs) { - var orgnames = docorgs.map(function(docorgs1) { + }, function (err, docorgs) { + var orgnames = docorgs.map(function (docorgs1) { return docorgs1.rowid; }); d4dModelNew.d4dModelMastersOrg.find({ @@ -1258,7 +1286,7 @@ module.exports.setRoutes = function(app, sessionVerification) { orgname_rowid: { $in: orgnames } - }, function(err, d4dMasterJson) { + }, function (err, d4dMasterJson) { if (err) { logger.error("Hit and error:", err); } @@ -1292,7 +1320,7 @@ module.exports.setRoutes = function(app, sessionVerification) { var settingsList = []; var loggedInUser = req.session.user.cn; var callCount = 0; - masterUtil.getActiveOrgs(loggedInUser, function(err, orgs) { + masterUtil.getActiveOrgs(loggedInUser, function (err, orgs) { logger.debug("got org list ==>", JSON.stringify(orgs)); if (err) { res.status(500).send("Failed to fetch Org."); @@ -1306,7 +1334,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); } for (var s = 0; s < settingsList.length; s++) { - (function(s1) { + (function (s1) { if (settingsList[s1].hasOwnProperty("1")) { delete settingsList[s1]; settingsList.push({ @@ -1317,7 +1345,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } })(s); } - masterUtil.getBusinessGroups(orgs, function(err, bgs) { + masterUtil.getBusinessGroups(orgs, function (err, bgs) { if (err) { res.status(500).send("Failed to fetch BGroups"); return; @@ -1331,7 +1359,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); } for (var s = 0; s < settingsList.length; s++) { - (function(s1) { + (function (s1) { if (settingsList[s1].hasOwnProperty("2")) { delete settingsList[s1]; settingsList.push({ @@ -1343,7 +1371,7 @@ module.exports.setRoutes = function(app, sessionVerification) { })(s); } } - masterUtil.getEnvironments(orgs, function(err, envs) { + masterUtil.getEnvironments(orgs, function (err, envs) { if (err) { res.status(500).send("Failed to fetch ENVs."); return; @@ -1357,7 +1385,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); } for (var s = 0; s < settingsList.length; s++) { - (function(s1) { + (function (s1) { if (settingsList[s1].hasOwnProperty("3")) { delete settingsList[s1]; settingsList.push({ @@ -1370,7 +1398,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } } // }); - masterUtil.getProjects(orgs, function(err, projects) { + masterUtil.getProjects(orgs, function (err, projects) { if (err) { res.status(500).send("Failed to fetch Projects."); return; @@ -1384,7 +1412,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); } for (var s = 0; s < settingsList.length; s++) { - (function(s1) { + (function (s1) { if (settingsList[s1].hasOwnProperty("4")) { logger.debug("Has project."); delete settingsList[s1]; @@ -1412,18 +1440,18 @@ module.exports.setRoutes = function(app, sessionVerification) { }); - app.get('/d4dMasters/getdashboardvalues/:items', function(req, res) { + app.get('/d4dMasters/getdashboardvalues/:items', function (req, res) { logger.debug("Enter get() for /d4dMasters/getdashboardvalues/%s", req.params.items); var masts = []; masts = req.params.items.split(','); logger.debug("Exit get() for /d4dMasters/getdashboardvalues/%s", req.params.items); }); - app.get('/d4dMasters/getprovider/:rowid', function(req, res) { + app.get('/d4dMasters/getprovider/:rowid', function (req, res) { logger.debug("Enter get() for /d4dMasters/getprovider/%s", req.params.rowid); d4dModel.findOne({ id: '9' - }, function(err, d4dMasterJson) { + }, function (err, d4dMasterJson) { if (err) { logger.error("Hit and error:", err); return; @@ -1431,7 +1459,7 @@ module.exports.setRoutes = function(app, sessionVerification) { if (d4dMasterJson) { var chefRepoPath = ''; var hasOrg = false; - d4dMasterJson.masterjson.rows.row.forEach(function(itm, i) { + d4dMasterJson.masterjson.rows.row.forEach(function (itm, i) { logger.debug("found %s", itm.field.length); for (var j = 0; j < itm.field.length; j++) { if (itm.field[j]["name"] == 'rowid') { @@ -1459,17 +1487,17 @@ module.exports.setRoutes = function(app, sessionVerification) { }); - app.get('/d4dMasters/getlist/:masterid/:fieldname', function(req, res) { + app.get('/d4dMasters/getlist/:masterid/:fieldname', function (req, res) { logger.debug("Enter get() for /d4dMasters/getlist/%s/%s", req.params.masterid, req.params.fieldname); d4dModel.findOne({ id: req.params.masterid - }, function(err, d4dMasterJson) { + }, function (err, d4dMasterJson) { if (err) { logger.error("Hit and error:", err); } if (d4dMasterJson) { var jsonlist = ''; - d4dMasterJson.masterjson.rows.row.forEach(function(itm, i) { + d4dMasterJson.masterjson.rows.row.forEach(function (itm, i) { logger.debug("found %s", itm.field.length); var rowid = ''; var fieldvalue = ''; @@ -1492,18 +1520,18 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/d4dMasters/getlist/:masterid/:fieldname/:fieldname1', function(req, res) { + app.get('/d4dMasters/getlist/:masterid/:fieldname/:fieldname1', function (req, res) { logger.debug("Enter get() for /d4dMasters/getlist/%s/%s/%s", req.params.masterid, req.params.fieldname, req.params.fieldname); d4dModel.findOne({ id: req.params.masterid - }, function(err, d4dMasterJson) { + }, function (err, d4dMasterJson) { if (err) { logger.error("Hit and error:", err); res.end(null); } if (d4dMasterJson) { var jsonlist = ''; - d4dMasterJson.masterjson.rows.row.forEach(function(itm, i) { + d4dMasterJson.masterjson.rows.row.forEach(function (itm, i) { logger.debug("found %s", itm.field.length); var rowid = ''; var fieldvalue = ''; @@ -1532,9 +1560,9 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/d4dMasters/getorgnamebychefserver/:chefserver', function(req, res) { + app.get('/d4dMasters/getorgnamebychefserver/:chefserver', function (req, res) { logger.debug("Enter get() for /d4dMasters/getorgnamebychefserver/%s", req.params.chefserver); - configmgmtDao.getListFiltered(10, 'orgname', 'configname', req.params.chefserver, function(err, catorgname) { + configmgmtDao.getListFiltered(10, 'orgname', 'configname', req.params.chefserver, function (err, catorgname) { if (err) { res.send(500); return; @@ -1552,7 +1580,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.post('/d4dMasters/getListFiltered/:masterid', function(req, res) { + app.post('/d4dMasters/getListFiltered/:masterid', function (req, res) { logger.debug("Enter post() for /d4dMasters/getListFiltered/%s", req.params.masterid); if (req.params.masterid === "10" && typeof req.body.orgname != "undefined") { logger.debug("Request body : ", JSON.stringify(req.body)); @@ -1561,7 +1589,7 @@ module.exports.setRoutes = function(app, sessionVerification) { orgname: orgName, id: "1", active: true - }, function(err, anOrg) { + }, function (err, anOrg) { if (err) { logger.debug("Error occored to get Org."); return; @@ -1570,7 +1598,7 @@ module.exports.setRoutes = function(app, sessionVerification) { var query = {}; query['id'] = req.params.masterid; query['orgname_rowid'] = anOrg[0].rowid; - d4dModelNew.d4dModelMastersConfigManagement.find(query, function(err, d4dMasterJson) { + d4dModelNew.d4dModelMastersConfigManagement.find(query, function (err, d4dMasterJson) { if (err) { logger.error("Hit and error:", err); } @@ -1590,7 +1618,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); } else { - configmgmtDao.getDBModelFromID(req.params.masterid, function(err, dbtype) { + configmgmtDao.getDBModelFromID(req.params.masterid, function (err, dbtype) { if (err) { logger.error("Hit and error:", err); } @@ -1601,11 +1629,11 @@ module.exports.setRoutes = function(app, sessionVerification) { var bodyJson = JSON.parse(JSON.stringify(req.body)); logger.debug("Query Build in getListFiltered: %s", JSON.stringify(bodyJson)); var _keys = Object.keys(bodyJson); - _keys.forEach(function(k, v) { + _keys.forEach(function (k, v) { logger.debug(k, bodyJson[k]); query[k] = bodyJson[k]; }); - eval('d4dModelNew.' + dbtype).find(query, function(err, d4dMasterJson) { + eval('d4dModelNew.' + dbtype).find(query, function (err, d4dMasterJson) { if (err) { logger.error("Hit and error:", err); } @@ -1626,9 +1654,9 @@ module.exports.setRoutes = function(app, sessionVerification) { } }); - app.get('/d4dMasters/:masterid/:filtercolumnname/:filtercolumnvalue', function(req, res) { + app.get('/d4dMasters/:masterid/:filtercolumnname/:filtercolumnvalue', function (req, res) { logger.debug("Enter get() for /d4dMasters/%s/%s/%s", req.params.masterid, req.params.filtercolumnname, req.params.filtercolumnvalue); - configmgmtDao.getDBModelFromID(req.params.masterid, function(err, dbtype) { + configmgmtDao.getDBModelFromID(req.params.masterid, function (err, dbtype) { if (err) { logger.error("Hit and error:", err); } @@ -1638,7 +1666,7 @@ module.exports.setRoutes = function(app, sessionVerification) { query['id'] = req.params.masterid; logger.debug("Master Type: %s", dbtype); - eval('d4dModelNew.' + dbtype).find(query, function(err, d4dMasterJson) { + eval('d4dModelNew.' + dbtype).find(query, function (err, d4dMasterJson) { if (err) { logger.error("Hit and error:", err); } @@ -1649,22 +1677,22 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/d4dMasters/configmgmt/:rowid', function(req, res) { + app.get('/d4dMasters/configmgmt/:rowid', function (req, res) { logger.debug("Enter get() for /d4dMasters/configmgmt/%s", req.params.rowid); d4dModel.findOne({ id: '10' - }, function(err, d4dMasterJson) { + }, function (err, d4dMasterJson) { if (err) { logger.error("Hit and error:" + err); } if (d4dMasterJson) { var chefRepoPath = ''; - settingsController.getChefSettings(function(settings) { + settingsController.getChefSettings(function (settings) { chefRepoPath = settings.chefReposLocation; logger.debug("Repopath: %s", chefRepoPath); var hasOrg = false; - d4dMasterJson.masterjson.rows.row.forEach(function(itm, i) { + d4dMasterJson.masterjson.rows.row.forEach(function (itm, i) { logger.debug("found %s", itm.field.length); for (var j = 0; j < itm.field.length; j++) { if (itm.field[j]["name"] == 'rowid') { @@ -1706,7 +1734,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/d4dMasters/getuuid', function(req, res) { + app.get('/d4dMasters/getuuid', function (req, res) { logger.debug("Enter get() for /d4dMasters/getuuid"); var uuid1 = uuid.v4(); res.writeHead(200, { @@ -1721,9 +1749,9 @@ module.exports.setRoutes = function(app, sessionVerification) { var fs = require('fs'); var path = require('path'); - fs.mkdirParent = function(dirPath, mode, callback) { + fs.mkdirParent = function (dirPath, mode, callback) { //Call the standard fs.mkdir - fs.mkdir(dirPath, mode, function(error) { + fs.mkdir(dirPath, mode, function (error) { //When it fail in this way, do the custom steps if (error && error.errno === 34) { //Create all the parents recursively @@ -1748,17 +1776,18 @@ module.exports.setRoutes = function(app, sessionVerification) { } else mkdir_p(path, mode, null, position + 1); } - var mkdirSync1 = function(path) { + var mkdirSync1 = function (path) { try { fs.mkdirSync(path, 0777); - } catch (e) {} + } catch (e) { + } } function updateProjectWithEnv(project, bodyJson) { d4dModelNew.d4dModelMastersEnvironments.find({ id: "3", rowid: bodyJson['rowid'] - }, function(err, envs) { + }, function (err, envs) { if (err) { logger.debug("Failed to fetch Env.", err); } else if (envs.length > 0) { @@ -1800,18 +1829,19 @@ module.exports.setRoutes = function(app, sessionVerification) { logger.debug('Updated project ' + project.projectname + ' with env : ' + envName); return; }); - }else { + } else { return; } }); - }; + } + ; function updateProjectWithServer(key, bodyJson) { if (key === 'nexus') { - var projectList = bodyJson['projectname_rowid'].split(','); - if(projectList.length > 0) { - for(var i = 0;i 0) { + for (var i = 0; i < projectList.length; i++) { + (function (projectId) { d4dModelNew.d4dModelMastersProjects.findOne({ id: "4", rowid: projectId @@ -1854,14 +1884,14 @@ module.exports.setRoutes = function(app, sessionVerification) { }); })(projectList[i]); } - }else{ + } else { return; } - }else if(key === 'docker'){ - var projectList = bodyJson['projectname_rowid'].split(','); - if(projectList.length > 0) { - for(var i = 0;i 0) { + for (var i = 0; i < projectList.length; i++) { + (function (projectId) { d4dModelNew.d4dModelMastersProjects.findOne({ id: "4", rowid: projectId @@ -1904,10 +1934,10 @@ module.exports.setRoutes = function(app, sessionVerification) { }); })(projectList[i]); } - }else{ + } else { return; } - }else{ + } else { return; } } @@ -1928,37 +1958,37 @@ module.exports.setRoutes = function(app, sessionVerification) { } - function changeArrayToString(list){ - var resultStr=''; - for(var i = 0; i < list.length; i++){ + function changeArrayToString(list) { + var resultStr = ''; + for (var i = 0; i < list.length; i++) { resultStr = resultStr + list[i] + ','; } - if(resultStr.slice(-1) === ','){ - var res = resultStr.slice(0,-1); + if (resultStr.slice(-1) === ',') { + var res = resultStr.slice(0, -1); return res; - }else{ + } else { return resultStr; } } - function removeStringFromArray(list,str){ - var resultStr=''; - for(var i = 0; i < list.length; i++){ + function removeStringFromArray(list, str) { + var resultStr = ''; + for (var i = 0; i < list.length; i++) { if (i === list.length - 1) { - if(str !== list[i]) { + if (str !== list[i]) { resultStr = resultStr + list[i]; } } else { - if(str !== list[i]) { + if (str !== list[i]) { resultStr = resultStr + list[i] + ','; } } } - if(resultStr.slice(-1) === ','){ - var res = resultStr.slice(0,-1); + if (resultStr.slice(-1) === ',') { + var res = resultStr.slice(0, -1); return res; - }else{ + } else { return resultStr; } } @@ -1966,8 +1996,8 @@ module.exports.setRoutes = function(app, sessionVerification) { function dissociateProjectWithEnv(projects, bodyJson) { - for(var i = 0; i < projects.length; i++) { - (function(project) { + for (var i = 0; i < projects.length; i++) { + (function (project) { var projectEnvId = project.environmentname_rowid.split(","); var projectEnvName = project.environmentname.split(","); d4dModelNew.d4dModelMastersProjects.update({ @@ -1989,8 +2019,10 @@ module.exports.setRoutes = function(app, sessionVerification) { return; }); })(projects[i]); - }; - }; + } + ; + } + ; function saveuploadedfile(suffix, folderpath, req) { logger.debug(req.body); @@ -2011,7 +2043,7 @@ module.exports.setRoutes = function(app, sessionVerification) { var filesNames = Object.keys(req.files); var count = filesNames.length; - filesNames.forEach(function(item) { + filesNames.forEach(function (item) { logger.debug(item); }); @@ -2089,26 +2121,26 @@ module.exports.setRoutes = function(app, sessionVerification) { logger.debug("In ssl fetch"); var options = { cwd: chefRepoPath + req.params.orgid + folderpath, - onError: function(err) { + onError: function (err) { callback(err, null); }, - onClose: function(code) { + onClose: function (code) { callback(null, code); } }; var cmdSSLFetch = 'knife ssl fetch'; - var procSSLFetch = exec(cmdSSLFetch, options, function(err, stdOut, stdErr) { + var procSSLFetch = exec(cmdSSLFetch, options, function (err, stdOut, stdErr) { if (err) { logger.debug("Failed on procSSLFetch routes d4dMasters:", err); return; } }); - procSSLFetch.on('close', function(code) { + procSSLFetch.on('close', function (code) { logger.debug("procSSLFetch done: "); }); - procSSLFetch.stdout.on('data', function(data) { + procSSLFetch.stdout.on('data', function (data) { logger.debug("procSSLFetch : %s", data); }); } @@ -2116,9 +2148,9 @@ module.exports.setRoutes = function(app, sessionVerification) { } - app.post('/d4dmasters/getrows/:masterid', function(req, res) { + app.post('/d4dmasters/getrows/:masterid', function (req, res) { logger.debug("Enter post() for /d4dmasters/getrows/%s", req.params.masterid); - configmgmtDao.getDBModelFromID(req.params.masterid, function(err, dbtype) { + configmgmtDao.getDBModelFromID(req.params.masterid, function (err, dbtype) { if (err) { logger.error("Hit and error:", err); } @@ -2130,7 +2162,7 @@ module.exports.setRoutes = function(app, sessionVerification) { query['id'] = req.params.masterid; logger.debug("Master Type: %s", dbtype); - eval('d4dModelNew.' + dbtype).find(query, function(err, d4dMasterJson) { + eval('d4dModelNew.' + dbtype).find(query, function (err, d4dMasterJson) { if (err) { logger.error("Hit and error:", err); } @@ -2144,11 +2176,11 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.post('/d4dMastersold/getrows/:masterid', function(req, res) { + app.post('/d4dMastersold/getrows/:masterid', function (req, res) { logger.debug("Enter post() for /d4dMastersold/getrows/%s", req.params.masterid); d4dModel.findOne({ id: req.params.masterid - }, function(err, d4dMasterJson) { + }, function (err, d4dMasterJson) { if (err) { logger.error("Hit and error:", err); } @@ -2157,9 +2189,9 @@ module.exports.setRoutes = function(app, sessionVerification) { if (bodyJson["serviceids"] != null) { var root = ''; - bodyJson["serviceids"].forEach(function(serviceid, servicecount) { + bodyJson["serviceids"].forEach(function (serviceid, servicecount) { logger.debug("%s :: %s", serviceid, servicecount); - d4dMasterJson.masterjson.rows.row.forEach(function(itm, i) { + d4dMasterJson.masterjson.rows.row.forEach(function (itm, i) { logger.debug("found %s", itm.field.length); var configmgmt = ''; for (var j = 0; j < itm.field.length; j++) { @@ -2181,7 +2213,8 @@ module.exports.setRoutes = function(app, sessionVerification) { if (root != '') root += ",{" + configmgmt + "}"; else - root += "{" + configmgmt + "}";; + root += "{" + configmgmt + "}"; + ; } }); // rows loop @@ -2197,11 +2230,11 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.post('/d4dMasters/savemasterjsonfull/:id', function(req, res) { + app.post('/d4dMasters/savemasterjsonfull/:id', function (req, res) { logger.debug("Enter post() for /d4dMasters/savemasterjsonfull/%s", req.params.id); d4dModel.findOne({ id: req.params.id - }, function(err, d4dMasterJson) { + }, function (err, d4dMasterJson) { if (err) { logger.error("Hit and error:", err); } @@ -2227,7 +2260,7 @@ module.exports.setRoutes = function(app, sessionVerification) { var frmkeys = Object.keys(bodyJson); var rowFLD = []; logger.debug(JSON.stringify(bodyJson)); - frmkeys.forEach(function(itm) { + frmkeys.forEach(function (itm) { if (!editMode) { var thisVal = bodyJson[itm]; var item; @@ -2250,11 +2283,11 @@ module.exports.setRoutes = function(app, sessionVerification) { }); - app.post('/d4dMasters/savemasterjsonrow/:id/:fileinputs/:orgname', function(req, res) { + app.post('/d4dMasters/savemasterjsonrow/:id/:fileinputs/:orgname', function (req, res) { logger.debug('Enter post() for /d4dMasters/savemasterjsonrow/%s/%s/%s', req.params.id, req.params.fileinputs, req.params.orgname); d4dModel.findOne({ id: req.params.id - }, function(err, d4dMasterJson) { + }, function (err, d4dMasterJson) { if (err) { logger.error("Hit and error:", err); } @@ -2284,7 +2317,7 @@ module.exports.setRoutes = function(app, sessionVerification) { var frmkeys = Object.keys(bodyJson); var rowFLD = []; var folderpath = ''; //will hold the folderpath field to create the path in the system - frmkeys.forEach(function(itm) { + frmkeys.forEach(function (itm) { if (!editMode) { var thisVal = bodyJson[itm]; logger.debug("thisVal %s", thisVal); @@ -2329,7 +2362,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } }, { upsert: false - }, function(err, data) { + }, function (err, data) { if (err) { callback(err, null); res.send(500); @@ -2355,12 +2388,12 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.post('/d4dMasters/deactivateorg/:action', function(req, res) { + app.post('/d4dMasters/deactivateorg/:action', function (req, res) { logger.debug("Enter post() for /d4dMasters/deactivateorg/%s", req.params.action); var bodyJson = JSON.parse(JSON.stringify(req.body)); if (!req.orgid) { logger.debug('Org ID found %s', bodyJson.orgid); - configmgmtDao.deactivateOrg(bodyJson.orgid, req.params.action, function(err, data) { + configmgmtDao.deactivateOrg(bodyJson.orgid, req.params.action, function (err, data) { if (err) { logger.error('Error: ', err); res.send(500); @@ -2372,7 +2405,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } }); - app.post('/d4dMasters/savemasterjsonrownew/:id/:fileinputs/:orgname', function(req, res) { + app.post('/d4dMasters/savemasterjsonrownew/:id/:fileinputs/:orgname', function (req, res) { logger.debug("Enter post() for /d4dMasters/savemasterjsonrownew/%s/%s/%s", req.params.id, req.params.fileinputs, req.params.orgname); console.log("***********************"); console.log(JSON.stringify(req.body)); @@ -2395,14 +2428,14 @@ module.exports.setRoutes = function(app, sessionVerification) { permissionto = 'modify'; } - usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) { + usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function (err, data) { if (err) { logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false)); res.status(500).send("Server Error"); return; } - masterUtil.getLoggedInUser(user.cn, function(err, anUser) { + masterUtil.getLoggedInUser(user.cn, function (err, anUser) { if (err) { res.status(500).send("Failed to fetch User."); } @@ -2443,7 +2476,7 @@ module.exports.setRoutes = function(app, sessionVerification) { bodyJson["environmentname"] = bodyJson["puppetenvironmentname"]; } } - configmgmtDao.getDBModelFromID(req.params.id, function(err, dbtype) { + configmgmtDao.getDBModelFromID(req.params.id, function (err, dbtype) { if (err) { logger.error("Hit and error:", err); } @@ -2452,7 +2485,7 @@ module.exports.setRoutes = function(app, sessionVerification) { eval('d4dModelNew.' + dbtype).findOne({ rowid: bodyJson["rowid"] - }, function(err, d4dMasterJson) { + }, function (err, d4dMasterJson) { if (err) { logger.error("Hit and error:", err); } @@ -2468,7 +2501,7 @@ module.exports.setRoutes = function(app, sessionVerification) { var rowFLD = []; var folderpath = ''; //will hold the folderpath field to create the path in the system var newrowid = ''; - frmkeys.forEach(function(itm) { + frmkeys.forEach(function (itm) { logger.debug("Each item: itm %s bodyJson[itm] %s", itm, bodyJson[itm]); if (itm.trim() == 'rowid') { logger.debug('!!!! in rowid %s', bodyJson[itm]); @@ -2520,23 +2553,23 @@ module.exports.setRoutes = function(app, sessionVerification) { "orgname": bodyJson['orgname'], "domainname": bodyJson['domainname'], "rowid": bodyJson['rowid'], - "plannedCost":bodyJson['plannedCost'], + "plannedCost": bodyJson['plannedCost'], "id": "1" } var orgObj = new d4dModelNew.d4dModelMastersOrg(orgData); - orgObj.save(function(err, anOrg) { + orgObj.save(function (err, anOrg) { if (err) { res.status(500).send("Failed to save Org."); return; } async.parallel({ - template:function(callback){ + template: function (callback) { for (var x1 = 0; x1 < 6; x1++) { - (function(x1) { + (function (x1) { var templatetypename; var designtemplateicon_filename; var templatetype; - if(x1 === 0) { + if (x1 === 0) { templatetypename = "Docker"; designtemplateicon_filename = "Docker.png"; templatetype = "docker"; @@ -2574,22 +2607,22 @@ module.exports.setRoutes = function(app, sessionVerification) { }; var templateTypeModel = new d4dModelNew.d4dModelMastersDesignTemplateTypes(templateTypeData); - templateTypeModel.save(function(err, aTemplateType) { + templateTypeModel.save(function (err, aTemplateType) { if (err) { logger.debug("Failed to save TemplateType."); } logger.debug("Default TemplateType created."); - if(x1 === 5){ - callback(null,aTemplateType); + if (x1 === 5) { + callback(null, aTemplateType); return; } }); })(x1); } }, - team:function(callback){ + team: function (callback) { for (var x = 0; x < 4; x++) { - (function(x) { + (function (x) { var teamName; var descriptions; if (x === 0) { @@ -2620,13 +2653,13 @@ module.exports.setRoutes = function(app, sessionVerification) { }; var teamModel = new d4dModelNew.d4dModelMastersTeams(teamData); - teamModel.save(function(err, aTeam) { + teamModel.save(function (err, aTeam) { if (err) { logger.debug("Failed to save Team."); } logger.debug("Auto created Team: ", JSON.stringify(aTeam)); if (x === 3) { - callback(null,aTeam); + callback(null, aTeam); return; } }); @@ -2634,30 +2667,30 @@ module.exports.setRoutes = function(app, sessionVerification) { } }, - wizard:function(callback){ + wizard: function (callback) { var settingWizardSteps = appConfig.settingWizardSteps; - var currentStep=settingWizardSteps[1]; - if(currentStep.nestedSteps){ + var currentStep = settingWizardSteps[1]; + if (currentStep.nestedSteps) { currentStep.nestedSteps[0].isCompleted = true; } var wizardBody = { - orgId:bodyJson["rowid"], - orgName:bodyJson["orgname"], - previousStep:settingWizardSteps[0], - currentStep:currentStep, - nextStep:settingWizardSteps[2] + orgId: bodyJson["rowid"], + orgName: bodyJson["orgname"], + previousStep: settingWizardSteps[0], + currentStep: currentStep, + nextStep: settingWizardSteps[2] } - settingWizard.createSettingWizard(wizardBody,function(err,data){ + settingWizard.createSettingWizard(wizardBody, function (err, data) { if (err) { logger.debug("Failed to save Setting Wizard."); } logger.debug("Setting Wizard created."); - callback(null,data); + callback(null, data); return; }); } - },function(err,results){ - if(err){ + }, function (err, results) { + if (err) { res.status(500).send("Failed to save template/Team/Wizard."); return; } @@ -2666,7 +2699,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }) }); } else if (req.params.id === '7') { - authUtil.hashPassword(bodyJson["password"], function(err, hashedPassword) { + authUtil.hashPassword(bodyJson["password"], function (err, hashedPassword) { if (err) { logger.error('Hit error', err); res.send(500); @@ -2675,7 +2708,7 @@ module.exports.setRoutes = function(app, sessionVerification) { logger.debug("hashedPassword: ", hashedPassword); bodyJson["password"] = hashedPassword; var userModel = new d4dModelNew.d4dModelMastersUsers(bodyJson); - userModel.save(function(err, data) { + userModel.save(function (err, data) { if (err) { logger.error('Hit Save error', err); res.send(500); @@ -2687,7 +2720,7 @@ module.exports.setRoutes = function(app, sessionVerification) { for (var x = 0; x < rowId.length; x++) { d4dModelNew.d4dModelMastersTeams.find({ rowid: rowId[x] - }, function(err, teamData) { + }, function (err, teamData) { if (err) { logger.debug("Error : ", err); } @@ -2707,7 +2740,7 @@ module.exports.setRoutes = function(app, sessionVerification) { $set: JSON.parse(JSON.stringify(teamData[0])) }, { upsert: false - }, function(err, updatedTeam) { + }, function (err, updatedTeam) { if (err) { logger.debug("Failed to update Team: ", errorResponses.db.error); } @@ -2719,7 +2752,7 @@ module.exports.setRoutes = function(app, sessionVerification) { if (bodyJson['orgname_rowid'] === '' || bodyJson['orgname_rowid'] === null) { res.send(200); return; - }else { + } else { settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'], function (err, settingWizards) { if (err) { logger.error('Hit getting setting wizard error', err); @@ -2751,22 +2784,22 @@ module.exports.setRoutes = function(app, sessionVerification) { }); } else if (req.params.id === '4') { - // bodyJson['repositories'] = JSON.parse(bodyJson['repositories']); + // bodyJson['repositories'] = JSON.parse(bodyJson['repositories']); var projectModel = new d4dModelNew.d4dModelMastersProjects(bodyJson); - projectModel.save(function(err, data) { + projectModel.save(function (err, data) { if (err) { logger.error('Hit Save error', err); res.send(500); return; } - settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'],function(err,settingWizards){ - if(err){ + settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'], function (err, settingWizards) { + if (err) { logger.error('Hit getting setting wizard error', err); res.send(500); return; } var settingWizardSteps = appConfig.settingWizardSteps; - if(settingWizards.currentStep.name === 'Org Configuration') { + if (settingWizards.currentStep.name === 'Org Configuration') { settingWizards.currentStep.nestedSteps[2].isCompleted = true; settingWizards.currentStep.isCompleted = true; settingWizards.previousStep = settingWizards.currentStep; @@ -2781,7 +2814,7 @@ module.exports.setRoutes = function(app, sessionVerification) { res.send(200); return; }); - }else{ + } else { res.send(200); return; } @@ -2791,19 +2824,19 @@ module.exports.setRoutes = function(app, sessionVerification) { bodyJson['groupid'] = JSON.parse(bodyJson['groupid']); bodyJson['repositories'] = JSON.parse(bodyJson['repositories']); var nexusModel = new d4dModelNew.d4dModelMastersNexusServer(bodyJson); - nexusModel.save(function(err, data) { + nexusModel.save(function (err, data) { if (err) { logger.error('Hit Save error', err); res.send(500); return; } - settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'],function(err,settingWizards){ - if(err){ + settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'], function (err, settingWizards) { + if (err) { logger.error('Hit getting setting wizard error', err); res.send(500); return; } - if(settingWizards.currentStep.name === 'Devops Roles') { + if (settingWizards.currentStep.name === 'Devops Roles') { settingWizards.currentStep.nestedSteps[0].isCompleted = true; settingWizard.updateSettingWizard(settingWizards, function (err, data) { if (err) { @@ -2811,33 +2844,33 @@ module.exports.setRoutes = function(app, sessionVerification) { res.send(500); return; } - updateProjectWithServer('nexus',bodyJson); + updateProjectWithServer('nexus', bodyJson); res.send(200); return; }); - }else{ - updateProjectWithServer('nexus',bodyJson); + } else { + updateProjectWithServer('nexus', bodyJson); res.send(200); return; } }) }); - } else if(req.params.id === '18'){ + } else if (req.params.id === '18') { bodyJson['repositories'] = JSON.parse(bodyJson['repositories']); var dockerModel = new d4dModelNew.d4dModelMastersDockerConfig(bodyJson); - dockerModel.save(function(err, data) { + dockerModel.save(function (err, data) { if (err) { logger.error('Hit Save error', err); res.send(500); return; } - settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'],function(err,settingWizards){ - if(err){ + settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'], function (err, settingWizards) { + if (err) { logger.error('Hit getting setting wizard error', err); res.send(500); return; } - if(settingWizards.currentStep.name === 'Devops Roles') { + if (settingWizards.currentStep.name === 'Devops Roles') { settingWizards.currentStep.nestedSteps[1].isCompleted = true; settingWizard.updateSettingWizard(settingWizards, function (err, data) { if (err) { @@ -2845,12 +2878,12 @@ module.exports.setRoutes = function(app, sessionVerification) { res.send(500); return; } - updateProjectWithServer('docker',bodyJson); + updateProjectWithServer('docker', bodyJson); res.send(200); return; }); - }else{ - updateProjectWithServer('docker',bodyJson); + } else { + updateProjectWithServer('docker', bodyJson); res.send(200); return; } @@ -2858,7 +2891,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); } else { eval('var mastersrdb = new d4dModelNew.' + dbtype + '({' + JSON.parse(FLD) + '})'); - mastersrdb.save(function(err, data) { + mastersrdb.save(function (err, data) { if (err) { logger.error('Hit Save error', err); res.send(500); @@ -2867,14 +2900,14 @@ module.exports.setRoutes = function(app, sessionVerification) { } logger.debug('New Master Saved'); logger.debug(req.params.fileinputs == 'null'); - if(req.params.id === '21'){ - settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'],function(err,settingWizards){ - if(err){ + if (req.params.id === '21') { + settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'], function (err, settingWizards) { + if (err) { logger.error('Hit getting setting wizard error', err); res.send(500); return; } - if(settingWizards.currentStep.name === 'User Configuration') { + if (settingWizards.currentStep.name === 'User Configuration') { settingWizards.currentStep.nestedSteps[0].isCompleted = true; settingWizard.updateSettingWizard(settingWizards, function (err, data) { if (err) { @@ -2886,14 +2919,14 @@ module.exports.setRoutes = function(app, sessionVerification) { } }) } - if(req.params.id === '2'){ - settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'],function(err,settingWizards){ - if(err){ + if (req.params.id === '2') { + settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'], function (err, settingWizards) { + if (err) { logger.error('Hit getting setting wizard error', err); res.send(500); return; } - if(settingWizards.currentStep.name === 'Org Configuration') { + if (settingWizards.currentStep.name === 'Org Configuration') { settingWizards.currentStep.nestedSteps[1].isCompleted = true; settingWizard.updateSettingWizard(settingWizards, function (err, data) { if (err) { @@ -2905,14 +2938,14 @@ module.exports.setRoutes = function(app, sessionVerification) { } }) } - if(req.params.id === '10'){ - settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'],function(err,settingWizards){ - if(err){ + if (req.params.id === '10') { + settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'], function (err, settingWizards) { + if (err) { logger.error('Hit getting setting wizard error', err); res.send(500); return; } - if(settingWizards.currentStep.name === 'Config Management') { + if (settingWizards.currentStep.name === 'Config Management') { settingWizards.currentStep.nestedSteps[0].isCompleted = true; settingWizard.updateSettingWizard(settingWizards, function (err, data) { if (err) { @@ -2924,14 +2957,14 @@ module.exports.setRoutes = function(app, sessionVerification) { } }) } - if(req.params.id === '19'){ - settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'],function(err,settingWizards){ - if(err){ + if (req.params.id === '19') { + settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'], function (err, settingWizards) { + if (err) { logger.error('Hit getting setting wizard error', err); res.send(500); return; } - if(settingWizards.currentStep.name === 'Gallery Setup') { + if (settingWizards.currentStep.name === 'Gallery Setup') { settingWizards.currentStep.nestedSteps[1].isCompleted = true; settingWizard.updateSettingWizard(settingWizards, function (err, data) { if (err) { @@ -2943,15 +2976,15 @@ module.exports.setRoutes = function(app, sessionVerification) { } }) } - if(req.params.id === '20'){ - settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'],function(err,settingWizards){ - if(err){ + if (req.params.id === '20') { + settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'], function (err, settingWizards) { + if (err) { logger.error('Hit getting setting wizard error', err); res.send(500); return; } var settingWizardSteps = appConfig.settingWizardSteps; - if(settingWizards.currentStep.name === 'Devops Roles') { + if (settingWizards.currentStep.name === 'Devops Roles') { settingWizards.currentStep.nestedSteps[2].isCompleted = true; settingWizards.currentStep.isCompleted = true; settingWizards.previousStep = settingWizards.currentStep; @@ -2967,14 +3000,14 @@ module.exports.setRoutes = function(app, sessionVerification) { } }) } - if(req.params.id === '17'){ - settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'],function(err,settingWizards){ - if(err){ + if (req.params.id === '17') { + settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'], function (err, settingWizards) { + if (err) { logger.error('Hit getting setting wizard error', err); res.send(500); return; } - if(settingWizards.currentStep.name === 'Gallery Setup') { + if (settingWizards.currentStep.name === 'Gallery Setup') { settingWizards.currentStep.nestedSteps[0].isCompleted = true; settingWizard.updateSettingWizard(settingWizards, function (err, data) { if (err) { @@ -2986,14 +3019,14 @@ module.exports.setRoutes = function(app, sessionVerification) { } }) } - if(req.params.id === '3'){ - settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'],function(err,settingWizards){ - if(err){ + if (req.params.id === '3') { + settingWizard.getSettingWizardByOrgId(bodyJson['orgname_rowid'], function (err, settingWizards) { + if (err) { logger.error('Hit getting setting wizard error', err); res.send(500); return; } - if(settingWizards.currentStep.name === 'Config Management') { + if (settingWizards.currentStep.name === 'Config Management') { var settingWizardSteps = appConfig.settingWizardSteps; settingWizards.currentStep.nestedSteps[1].isCompleted = true; settingWizards.currentStep.isCompleted = true; @@ -3024,7 +3057,7 @@ module.exports.setRoutes = function(app, sessionVerification) { d4dModelNew.d4dModelMastersProjects.findOne({ rowid: projectIds[i], id: "4" - }, function(err,project) { + }, function (err, project) { if (!err) { updateProjectWithEnv(project, bodyJson); } @@ -3046,9 +3079,9 @@ module.exports.setRoutes = function(app, sessionVerification) { // Update settings if (req.params.id === '4') { - // bodyJson['repositories'] = JSON.parse(bodyJson['repositories']); + // bodyJson['repositories'] = JSON.parse(bodyJson['repositories']); delete rowtoedit._id; //fixing the issue of - // rowtoedit["repositories"] = bodyJson['repositories']; + // rowtoedit["repositories"] = bodyJson['repositories']; logger.debug('Rowtoedit: %s', JSON.stringify(rowtoedit)); eval('d4dModelNew.' + dbtype).update({ rowid: bodyJson["rowid"], @@ -3057,7 +3090,7 @@ module.exports.setRoutes = function(app, sessionVerification) { $set: rowtoedit }, { upsert: false - }, function(err, saveddata) { + }, function (err, saveddata) { if (err) { logger.error('Hit Save error', err); res.send(500); @@ -3080,7 +3113,7 @@ module.exports.setRoutes = function(app, sessionVerification) { $set: rowtoedit }, { upsert: false - }, function(err, saveddata) { + }, function (err, saveddata) { if (err) { logger.error('Hit Save error', err); res.send(500); @@ -3094,7 +3127,7 @@ module.exports.setRoutes = function(app, sessionVerification) { d4dModelNew.d4dModelMastersUsers.find({ "id": req.params.id, loginname: bodyJson["loginname"] - }, function(err, anUser) { + }, function (err, anUser) { if (err) { logger.debug("Error to fetch user."); res.status(500).send("Error to fetch User."); @@ -3119,7 +3152,7 @@ module.exports.setRoutes = function(app, sessionVerification) { $set: rowtoedit }, { upsert: false - }, function(err, saveddata) { + }, function (err, saveddata) { if (err) { logger.error('Hit Save error', err); res.send(500); @@ -3130,7 +3163,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); } else if (bodyJson["password"] != anUser[0].password) { - authUtil.hashPassword(bodyJson["password"], function(err, hashedPassword) { + authUtil.hashPassword(bodyJson["password"], function (err, hashedPassword) { if (err) { logger.error('Hit error', err); res.send(500); @@ -3151,7 +3184,7 @@ module.exports.setRoutes = function(app, sessionVerification) { $set: rowtoedit }, { upsert: false - }, function(err, saveddata) { + }, function (err, saveddata) { if (err) { logger.error('Hit Save error', err); res.send(500); @@ -3175,7 +3208,7 @@ module.exports.setRoutes = function(app, sessionVerification) { $set: rowtoedit }, { upsert: false - }, function(err, saveddata) { + }, function (err, saveddata) { if (err) { logger.error('Hit Save error', err); res.send(500); @@ -3197,7 +3230,7 @@ module.exports.setRoutes = function(app, sessionVerification) { $regex: bodyJson['rowid'] }, id: "4" - }, function(err,project) { + }, function (err, project) { if (!err) { dissociateProjectWithEnv(project, bodyJson); } @@ -3213,7 +3246,7 @@ module.exports.setRoutes = function(app, sessionVerification) { $set: rowtoedit }, { upsert: false - }, function(err, saveddata) { + }, function (err, saveddata) { if (err) { logger.error('Hit Save error', err); res.send(500); @@ -3232,7 +3265,7 @@ module.exports.setRoutes = function(app, sessionVerification) { d4dModelNew.d4dModelMastersProjects.findOne({ rowid: projectIds[i], id: "4" - }, function(err,project) { + }, function (err, project) { if (!err) { updateProjectWithEnv(project, bodyJson); } @@ -3250,7 +3283,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } }, { upsert: false - }, function(err, updateCount) { + }, function (err, updateCount) { if (err) { logger.debug("Team update Fail..", err); } @@ -3258,7 +3291,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } if (req.params.id === '1') { - masterUtil.updateTeam(bodyJson['rowid'], function(err, aBody) { + masterUtil.updateTeam(bodyJson['rowid'], function (err, aBody) { if (err) { logger.debug("Error on update Org.".err); } @@ -3318,7 +3351,7 @@ module.exports.setRoutes = function(app, sessionVerification) { "id": "21" }; var teamModel = new d4dModelNew.d4dModelMastersTeams(teamData); - teamModel.save(function(err, aTeam) { + teamModel.save(function (err, aTeam) { if (err) { logger.error("Failed to save Team: ", err); } @@ -3328,7 +3361,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } } - app.post('/d4dMasters/testingupload/:suffix/:fileinputs', function(req, res) { + app.post('/d4dMasters/testingupload/:suffix/:fileinputs', function (req, res) { logger.debug("Enter post() for /d4dMasters/testingupload/%s/%s", req.params.suffix, req.params.fileinputs); var fi; if (req.params.fileinputs.indexOf(',') > 0) @@ -3341,11 +3374,11 @@ module.exports.setRoutes = function(app, sessionVerification) { var filesNames = Object.keys(req.files); var count = filesNames.length; logger.debug('in %s', count); - filesNames.forEach(function(item) { + filesNames.forEach(function (item) { logger.debug(item); }); - settingsController.getChefSettings(function(settings) { + settingsController.getChefSettings(function (settings) { var chefRepoPath = settings.chefReposLocation; fs.mkdirParent(chefRepoPath + req.params.orgname); //if path is not present create it. for (var i = 0; i < fi.length; i++) { @@ -3353,8 +3386,8 @@ module.exports.setRoutes = function(app, sessionVerification) { var fil = eval('req.files.' + fi[i]); if (typeof fil != 'undefined') { logger.debug('this is where file gets saved : %s %s', chefRepoPath, fil.name); - fileIo.readFile(fil.path, function(err, data) { - fileIo.writeFile(chefRepoPath + req.params.orgname + '/' + controlName + '__' + fil.name, data, null, function(err) { + fileIo.readFile(fil.path, function (err, data) { + fileIo.writeFile(chefRepoPath + req.params.orgname + '/' + controlName + '__' + fil.name, data, null, function (err) { logger.error("Hit error: ", err); count--; if (count === 0) { // all files uploaded @@ -3369,12 +3402,12 @@ module.exports.setRoutes = function(app, sessionVerification) { logger.debug("Exit post() for /d4dMasters/testingupload/%s/%s", req.params.suffix, req.params.fileinputs); }); - app.post('/d4dMasters/savemasterjson/:id', function(req, res) { + app.post('/d4dMasters/savemasterjson/:id', function (req, res) { //Finding the Master Json if present logger.debug("Enter post() for /d4dMasters/savemasterjson/%s", req.params.id); d4dModel.findOne({ id: req.params.id - }, function(err, d4dMasterJson) { + }, function (err, d4dMasterJson) { if (err) { logger.error("Hit and error:", err); } @@ -3383,17 +3416,18 @@ module.exports.setRoutes = function(app, sessionVerification) { id: '1', masterjson: req.body }); - d4dmj.save(function(err, d4dmj) { + d4dmj.save(function (err, d4dmj) { if (err) { logger.error("Hit and error:", err) res.send(500); - }; + } + ; logger.debug('saved'); }); res.send(200); } else { d4dMasterJson.masterjson = req.body; - d4dMasterJson.save(function(err, d4dMasterJson) { + d4dMasterJson.save(function (err, d4dMasterJson) { if (err) { logger.error("Hit and error:", err) } @@ -3406,7 +3440,7 @@ module.exports.setRoutes = function(app, sessionVerification) { //mongoose.disconnect(); }); - app.get('/createbg/:orgname/:bgname', function(req, res) { + app.get('/createbg/:orgname/:bgname', function (req, res) { logger.debug("Enter get() for /createbg/%s/%s", req.params.orgname, req.params.bgname); var bgfield = "{\"field\":[{\"values\":{\"value\":\"" + req.params.bgname + "\"},\"name\":\"productgroupname\"},{\"values\":{\"value\":\"" + req.params.orgname + "\"},\"name\":\"orgname\"},{\"name\":\"costcode\"}] }"; db.on('error', console.error.bind(console, 'connection error:')); @@ -3416,13 +3450,13 @@ module.exports.setRoutes = function(app, sessionVerification) { }); d4dModel.findOne({ id: '2' - }, function(err, d4dMasterJson) { + }, function (err, d4dMasterJson) { if (err) { logger.error("Hit and error:", err); } if (d4dMasterJson) { var hasOrg = false; - d4dMasterJson.masterjson.rows.row.forEach(function(itm, i) { + d4dMasterJson.masterjson.rows.row.forEach(function (itm, i) { for (var j = 0; j < itm.field.length; j++) { if (itm.field[j]["name"] == 'productgroupname') { if (itm.field[j]["values"].value == req.params.bgname) { @@ -3444,7 +3478,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } }, { upsert: false - }, function(err, data) { + }, function (err, data) { if (err) { callback(err, null); res.send(500); @@ -3467,7 +3501,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); - app.get('/createproj/:orgname/:envname/:prodgroup/:projname', function(req, res) { + app.get('/createproj/:orgname/:envname/:prodgroup/:projname', function (req, res) { logger.debug("Enter get() for /createproj/%s/%s/%s/%s", req.params.orgname, req.params.envname, req.params.prodgroup, req.params.projname); var projField = "{\"field\":[{\"values\":{\"value\":\"" + req.params.projname + "\"},\"name\":\"projectname\"},{\"values\":{\"value\":\"" + req.params.orgname + "\"},\"name\":\"orgname\"},{\"values\":{\"value\":\"" + req.params.prodgroup + "\"},\"name\":\"productgroupname\"},{\"values\":{\"value\":\"" + req.params.envname + "\"},\"name\":\"environmentname\"},{\"values\":{\"value\":[\"Code 1\",\"Code 2\"]},\"name\":\"costcode\"}] }"; db.on('error', console.error.bind(console, 'connection error:')); @@ -3478,13 +3512,13 @@ module.exports.setRoutes = function(app, sessionVerification) { logger.debug('received request %s', req.params.orgname); d4dModel.findOne({ id: '4' - }, function(err, d4dMasterJson) { + }, function (err, d4dMasterJson) { if (err) { logger.error("Hit and error:", err); } if (d4dMasterJson) { var hasOrg = false; - d4dMasterJson.masterjson.rows.row.forEach(function(itm, i) { + d4dMasterJson.masterjson.rows.row.forEach(function (itm, i) { logger.debug("found %s", itm.field.length); for (var j = 0; j < itm.field.length; j++) { @@ -3508,7 +3542,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } }, { upsert: false - }, function(err, data) { + }, function (err, data) { if (err) { callback(err, null); res.send(500); @@ -3531,7 +3565,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); - app.get('/createenv/:orgname/:envname', function(req, res) { + app.get('/createenv/:orgname/:envname', function (req, res) { logger.debug("Enter get() for /createenv/%s/%s", req.params.orgname, req.params.envname); var envField = "{\"field\":[{\"name\":\"environmentname\",\"values\":{\"value\":\"" + req.params.envname + "\"}},{\"name\":\"orgname\",\"values\":{\"value\":\"" + req.params.orgname + "\"}}]}"; db.on('error', console.error.bind(console, 'connection error:')); @@ -3542,13 +3576,13 @@ module.exports.setRoutes = function(app, sessionVerification) { logger.debug('received request %s', req.params.orgname); d4dModel.findOne({ id: '3' - }, function(err, d4dMasterJson) { + }, function (err, d4dMasterJson) { if (err) { logger.error("Hit and error:", err); } if (d4dMasterJson) { var hasOrg = false; - d4dMasterJson.masterjson.rows.row.forEach(function(itm, i) { + d4dMasterJson.masterjson.rows.row.forEach(function (itm, i) { logger.debug("found %s", itm.field.length); for (var j = 0; j < itm.field.length; j++) { @@ -3572,7 +3606,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } }, { upsert: false - }, function(err, data) { + }, function (err, data) { if (err) { callback(err, null); res.send(500); @@ -3594,7 +3628,7 @@ module.exports.setRoutes = function(app, sessionVerification) { }); - app.get('/createorg/:orgname', function(req, res) { + app.get('/createorg/:orgname', function (req, res) { logger.debug("Enter get() for /createorg/%s", req.params.orgname); var orgField = "{\"field\":[{\"values\":{\"value\":\"" + req.params.orgname + "\"},\"name\":\"orgname\"},{\"values\":{\"value\":\"\"},\"name\":\"domainname\"},{\"values\":{\"value\":[\"Dev\",\"Test\",\"Stage\"]},\"name\":\"costcode\"}]}"; db.on('error', console.error.bind(console, 'connection error:')); @@ -3604,13 +3638,13 @@ module.exports.setRoutes = function(app, sessionVerification) { logger.debug('received request %s', req.params.orgname); d4dModel.findOne({ id: '1' - }, function(err, d4dMasterJson) { + }, function (err, d4dMasterJson) { if (err) { logger.error("Hit and error: ", err); } if (d4dMasterJson) { var hasOrg = false; - d4dMasterJson.masterjson.rows.row.forEach(function(itm, i) { + d4dMasterJson.masterjson.rows.row.forEach(function (itm, i) { for (var j = 0; j < itm.field.length; j++) { if (itm.field[j]["name"] == 'orgname') { if (itm.field[j]["values"].value == req.params.orgname) { @@ -3632,7 +3666,7 @@ module.exports.setRoutes = function(app, sessionVerification) { } }, { upsert: false - }, function(err, data) { + }, function (err, data) { if (err) { callback(err, null); res.send(500); @@ -3654,9 +3688,9 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/d4dMasters/:chefserver/cookbooks', function(req, res) { + app.get('/d4dMasters/:chefserver/cookbooks', function (req, res) { logger.debug("Enter get() for /d4dMasters/%s/cookbooks", req.params.chefserver); - configmgmtDao.getChefServerDetailsByChefServer(req.params.chefserver, function(err, chefDetails) { + configmgmtDao.getChefServerDetailsByChefServer(req.params.chefserver, function (err, chefDetails) { if (err) { res.send(500); return; @@ -3674,7 +3708,7 @@ module.exports.setRoutes = function(app, sessionVerification) { chefValidationPemFile: chefDetails.validatorpemfile, hostedChefUrl: chefDetails.url, }); - chef.getCookbooksList(function(err, cookbooks) { + chef.getCookbooksList(function (err, cookbooks) { logger.error(err); if (err) { res.send(500); @@ -3690,18 +3724,18 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.post('/d4dMasters/test', function(req, res) { + app.post('/d4dMasters/test', function (req, res) { var bodyJson = JSON.parse(JSON.stringify(req.body)); - configmgmtDao.getProjectsForTeams(bodyJson['teamids'], function(err, data) { + configmgmtDao.getProjectsForTeams(bodyJson['teamids'], function (err, data) { if (!err) { res.send(data); } }); }); - app.get('/d4dMasters/:chefserver/roles', function(req, res) { + app.get('/d4dMasters/:chefserver/roles', function (req, res) { logger.debug("Enter get() for /d4dMasters/%s/roles", req.params.chefserver); - configmgmtDao.getChefServerDetailsByChefServer(req.params.chefserver, function(err, chefDetails) { + configmgmtDao.getChefServerDetailsByChefServer(req.params.chefserver, function (err, chefDetails) { if (err) { res.send(500); return; @@ -3719,7 +3753,7 @@ module.exports.setRoutes = function(app, sessionVerification) { hostedChefUrl: chefDetails.url, }); - chef.getRolesList(function(err, roles) { + chef.getRolesList(function (err, roles) { logger.error(err); if (err) { res.send(500); @@ -3735,9 +3769,9 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/d4dMasters/loggedInUser', function(req, res) { + app.get('/d4dMasters/loggedInUser', function (req, res) { var loggedInUser = req.session.user.cn; - masterUtil.getLoggedInUser(loggedInUser, function(err, anUser) { + masterUtil.getLoggedInUser(loggedInUser, function (err, anUser) { if (err) { res.status(500).send("Failed to fetch User."); } @@ -3758,8 +3792,8 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/d4dMasters/orgs/all/users/7', function(req, res) { - masterUtil.getUsersForAllOrg(function(err, users) { + app.get('/d4dMasters/orgs/all/users/7', function (req, res) { + masterUtil.getUsersForAllOrg(function (err, users) { if (err) { res.status(500).send("Failed to fetch User."); } @@ -3768,11 +3802,11 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/d4dMasters/cftTemplate', function(req, res) { + app.get('/d4dMasters/cftTemplate', function (req, res) { var templateFile = req.query.templateFile; var settings = appConfig.chef; var chefRepoPath = settings.chefReposLocation; - fs.readFile(chefRepoPath + 'catalyst_files/' + templateFile, function(err, data) { + fs.readFile(chefRepoPath + 'catalyst_files/' + templateFile, function (err, data) { if (err) { logger.error("Unable to read template file " + templateFile, err); res.status(500).send({ @@ -3784,14 +3818,14 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/d4dMasters/configmanagement', function(req, res) { - masterUtil.getAllActiveOrg(function(err, orgList) { + app.get('/d4dMasters/configmanagement', function (req, res) { + masterUtil.getAllActiveOrg(function (err, orgList) { logger.debug("got org list ==>", JSON.stringify(orgList)); if (err) { res.status(500).send('Not able to fetch Orgs.'); return; } - masterUtil.getAllCongifMgmts(orgList, function(err, list) { + masterUtil.getAllCongifMgmts(orgList, function (err, list) { if (err) { logger.debug("Failed to fetch all configmanagement", err); res.status(500).send("Failed to fetch all configmanagement"); @@ -3803,8 +3837,8 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/d4dMasters/organization/:orgId/configmanagement/list', function(req, res) { - masterUtil.getAllCongifMgmtsForOrg(req.params.orgId, function(err, list) { + app.get('/d4dMasters/organization/:orgId/configmanagement/list', function (req, res) { + masterUtil.getAllCongifMgmtsForOrg(req.params.orgId, function (err, list) { if (err) { logger.debug("Failed to fetch all configmanagement", err); res.status(500).send("Failed to fetch all configmanagement"); @@ -3815,14 +3849,14 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/d4dMasters/configmanagement/:anId', function(req, res) { + app.get('/d4dMasters/configmanagement/:anId', function (req, res) { if (!req.params.anId) { res.status(400).send({ message: "Invalid Config Management Id" }); return; } - masterUtil.getCongifMgmtsById(req.params.anId, function(err, data) { + masterUtil.getCongifMgmtsById(req.params.anId, function (err, data) { if (err) { logger.debug("Failed to fetch all configmanagement", err); res.status(500).send("Failed to fetch all configmanagement"); @@ -3837,9 +3871,9 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/d4dMasters/env/:anId', function(req, res) { + app.get('/d4dMasters/env/:anId', function (req, res) { logger.debug("Entered to env"); - masterUtil.getEnvironmentName(req.params.anId, function(err, data) { + masterUtil.getEnvironmentName(req.params.anId, function (err, data) { if (err) { logger.debug("Failed to fetch Environment", err); res.status(500).send("Failed to fetch Environment"); @@ -3854,9 +3888,9 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/d4dMasters/project/:anId', function(req, res) { + app.get('/d4dMasters/project/:anId', function (req, res) { logger.debug("Entered to Project"); - masterUtil.getParticularProject(req.params.anId, function(err, data) { + masterUtil.getParticularProject(req.params.anId, function (err, data) { if (err) { logger.debug("Failed to fetch Environment", err); res.status(500).send("Failed to fetch Environment"); @@ -3871,9 +3905,9 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/d4dMasters/projectname/:anId', function(req, res) { + app.get('/d4dMasters/projectname/:anId', function (req, res) { logger.debug("Entered to Project"); - masterUtil.getProjectName(req.params.anId, function(err, data) { + masterUtil.getProjectName(req.params.anId, function (err, data) { if (err) { logger.debug("Failed to fetch Environment", err); res.status(500).send("Failed to fetch Environment"); @@ -3888,9 +3922,9 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/d4dMasters/docker/:anId', function(req, res) { + app.get('/d4dMasters/docker/:anId', function (req, res) { logger.debug("Entered to Project"); - masterUtil.getDockerById(req.params.anId, function(err, data) { + masterUtil.getDockerById(req.params.anId, function (err, data) { if (err) { logger.debug("Failed to fetch Docker", err); res.status(500).send("Failed to fetch Docker"); @@ -3905,12 +3939,12 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.post('/d4dMasters/project/:anId/appdeploy/appName/update', function(req, res) { + app.post('/d4dMasters/project/:anId/appdeploy/appName/update', function (req, res) { logger.debug("Updating appName in Project."); var appName = req.body.appName; var appDescription = req.body.description; var projectId = req.params.anId; - masterUtil.updateProject(projectId, appName, function(err, data) { + masterUtil.updateProject(projectId, appName, function (err, data) { if (err) { logger.debug("Failed to update Project with repo."); //res.status(500).send("Failed to update Project with repo."); @@ -3921,8 +3955,8 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/d4dMasters/org/:orgId/templateType/:templateType/templates', function(req, res) { - masterUtil.getTemplatesByOrgAndTemplateType(req.params.orgId, req.params.templateType, function(err, templates) { + app.get('/d4dMasters/org/:orgId/templateType/:templateType/templates', function (req, res) { + masterUtil.getTemplatesByOrgAndTemplateType(req.params.orgId, req.params.templateType, function (err, templates) { if (err) { logger.debug("Error getting templates", err); res.status(500).send({ @@ -3937,13 +3971,13 @@ module.exports.setRoutes = function(app, sessionVerification) { }); // List image tags w.r.t. docker repo and image - app.get('/d4dMasters/docker/:repository/:image/tags', function(req, res) { + app.get('/d4dMasters/docker/:repository/:image/tags', function (req, res) { logger.debug("Called docker image tags."); var options_auth = {}; client = new Client(options_auth); var dockerUrl = "https://registry.hub.docker.com/v1/repositories/" + req.params.repository + "/" + req.params.image + "/tags"; client.registerMethod("jsonMethod", dockerUrl, "GET"); - var reqSubmit = client.methods.jsonMethod(function(data, response) { + var reqSubmit = client.methods.jsonMethod(function (data, response) { //var json = parser.toJson(data); if (util.isArray(data)) { res.send(data); @@ -3955,18 +3989,18 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }); - app.get('/d4dMasters/organization/:orgId/repositoryServer/list', function(req, res) { - var jsonData= { + app.get('/d4dMasters/organization/:orgId/repositoryServer/list', function (req, res) { + var jsonData = { orgId: req.params.orgId, - nexusId:'26', - dockerId:'18' + nexusId: '26', + dockerId: '18' }; async.parallel({ - server:function(callback) { - masterUtil.getServerDetails(jsonData, callback) - } - }, - function(err, results) { + server: function (callback) { + masterUtil.getServerDetails(jsonData, callback) + } + }, + function (err, results) { if (err) res.status(500).send("Internal Server Error"); else if (!results) @@ -3979,12 +4013,12 @@ module.exports.setRoutes = function(app, sessionVerification) { // List image tags w.r.t. docker repo and image // For community image send repository= library - app.get('/d4dMasters/docker/:dockerId/repository/:repository/image/:image/tags', function(req, res) { - masterUtil.getDockerById(req.params.dockerId, function(err, docker) { + app.get('/d4dMasters/docker/:dockerId/repository/:repository/image/:image/tags', function (req, res) { + masterUtil.getDockerById(req.params.dockerId, function (err, docker) { if (err) { logger.debug("Failed to fetch Docker", err); } - logger.debug("docker: ",JSON.stringify(docker)); + logger.debug("docker: ", JSON.stringify(docker)); if (docker && docker.length) { var options_auth = { user: docker[0].dockeruserid, @@ -3993,7 +4027,7 @@ module.exports.setRoutes = function(app, sessionVerification) { client = new Client(options_auth); var dockerUrl = "https://registry.hub.docker.com/v1/repositories/" + req.params.repository + "/" + req.params.image + "/tags"; client.registerMethod("jsonMethod", dockerUrl, "GET"); - var reqSubmit = client.methods.jsonMethod(function(data, response) { + var reqSubmit = client.methods.jsonMethod(function (data, response) { if (util.isArray(data)) { res.send(data); return; @@ -4007,7 +4041,7 @@ module.exports.setRoutes = function(app, sessionVerification) { client = new Client(options_auth); var dockerUrl = "https://registry.hub.docker.com/v1/repositories/" + req.params.repository + "/" + req.params.image + "/tags"; client.registerMethod("jsonMethod", dockerUrl, "GET"); - var reqSubmit = client.methods.jsonMethod(function(data, response) { + var reqSubmit = client.methods.jsonMethod(function (data, response) { if (util.isArray(data)) { res.send(data); return; @@ -4019,4 +4053,28 @@ module.exports.setRoutes = function(app, sessionVerification) { } }); }); +}; + +function getMonitorDetail(data, callback) { + data = data.toObject(); + if (data.monitorId) { + var monitorId = data.monitorId; + delete data['monitorId']; + monitorsModel.getById(monitorId, function (err, monitor) { + if (err || !monitor) { + data.monitor = null; + } else { + data.monitor = {}; + data.monitor['id'] = monitor._id; + data.monitor['name'] = monitor.name; + } + logger.debug("data.monitor: ", JSON.stringify(monitor)); + logger.debug("data: ", JSON.stringify(data)); + callback(data); + }); + } else { + delete data['monitorId']; + data.monitor = null; + callback(data); + } } \ No newline at end of file diff --git a/server/app/routes/v1.0/routes_provider.js b/server/app/routes/v1.0/routes_provider.js index e941e7897..33ec26259 100644 --- a/server/app/routes/v1.0/routes_provider.js +++ b/server/app/routes/v1.0/routes_provider.js @@ -76,46 +76,32 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { keyPairs: keyPair, isDefault: providers[i].isDefault }; - if (providers[i].monitorId) { - var monitorId = providers[i].monitorId; - monitorsModel.getById(monitorId, function (err, monitor) { - if (err || !monitor) { - dommyProvider.monitor = null; - } else { - dommyProvider.monitor = {}; - dommyProvider.monitor['id'] = monitor._id; - dommyProvider.monitor['name'] = monitor.name; - dommyProvider.monitor['type'] = monitor.type; - if (monitor.type === 'sensu') { - dommyProvider.monitor['parameters'] = {}; - dommyProvider.monitor['parameters']['url'] = monitor['parameters']['url']; - dommyProvider.monitor['parameters']['transportProtocol'] = monitor['parameters']['transportProtocol']; - } - } - }); - } else { - dommyProvider.monitor = null; - } - var cryptoConfig = appConfig.cryptoSettings; - var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); + getMonitorDetail(providers[i], function (data) { + providers[i] = data; + dommyProvider.monitor = providers[i].monitor; - if (!providers[i].isDefault) { var cryptoConfig = appConfig.cryptoSettings; - var cryptography = new Cryptography(cryptoConfig.algorithm, - cryptoConfig.password); + var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); - dommyProvider.accessKey = cryptography.decryptText(providers[i].accessKey, - cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding); - dommyProvider.secretKey = cryptography.decryptText(providers[i].secretKey, - cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding); - } + if (!providers[i].isDefault) { + var cryptoConfig = appConfig.cryptoSettings; + var cryptography = new Cryptography(cryptoConfig.algorithm, + cryptoConfig.password); + + dommyProvider.accessKey = cryptography.decryptText(providers[i].accessKey, + cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding); + dommyProvider.secretKey = cryptography.decryptText(providers[i].secretKey, + cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding); + } + + providerList.push(dommyProvider); + logger.debug("count: ", count); + if (count === providers.length) { + res.send(providerList); + return; + } + }); - providerList.push(dommyProvider); - logger.debug("count: ", count); - if (count === providers.length) { - res.send(providerList); - return; - } } }); @@ -150,35 +136,24 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { } if (orgs.length > 0) { if (keyPair) { - if (aProvider.monitorId) { - var monitorId = aProvider.monitorId; - monitorsModel.getById(monitorId, function (err, monitor) { - if (err || !monitor) { - aProvider.monitor = null; - } else { - aProvider.monitor = {}; - aProvider.monitor['id'] = monitor._id; - aProvider.monitor['name'] = monitor.name; - } - }); - } else { - aProvider.monitor = null; - } - var dommyProvider = { - _id: aProvider._id, - id: 9, - providerName: aProvider.providerName, - providerType: aProvider.providerType, - s3BucketName: aProvider.s3BucketName, - orgId: aProvider.orgId, - plannedCost: aProvider.plannedCost, - orgName: orgs[0].orgname, - __v: aProvider.__v, - keyPairs: keyPair, - monitor: aProvider.monitor, - isDefault: aProvider.isDefault - }; - res.send(dommyProvider); + getMonitorDetail(aProvider, function (data) { + aProvider = data; + var dommyProvider = { + _id: aProvider._id, + id: 9, + providerName: aProvider.providerName, + providerType: aProvider.providerType, + s3BucketName: aProvider.s3BucketName, + orgId: aProvider.orgId, + plannedCost: aProvider.plannedCost, + orgName: orgs[0].orgname, + __v: aProvider.__v, + keyPairs: keyPair, + monitor: aProvider.monitor, + isDefault: aProvider.isDefault + }; + res.send(dommyProvider); + }); } } }); @@ -2485,26 +2460,15 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { var providersList = []; if (providers && providers.length > 0) { for (var i = 0; i < providers.length; i++) { - if (providers[i].monitorId) { - var monitorId = providers[i].monitorId; - delete providers[i].monitorId; - monitorsModel.getById(monitorId, function (err, monitor) { - if (err || !monitor) { - providers[i].monitor = null; - } else { - providers[i].monitor = {}; - providers[i].monitor['id'] = monitor._id; - providers[i].monitor['name'] = monitor.name; - } - }); - } else { - providers[i].monitor = null; - } - providersList.push(providers[i]); - if (providers.length === providersList.length) { - res.send(providersList); - return; - } + getMonitorDetail(providers[i], function (data) { + providers[i] = data; + providersList.push(providers[i]); + if (providers.length === providersList.length) { + res.send(providersList); + return; + } + }); + /*var keys = []; keys.push(providers[i].accessKey); @@ -2550,26 +2514,15 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { } if (providers.length > 0) { for (var i = 0; i < providers.length; i++) { - if (providers[i].monitorId) { - var monitorId = providers[i].monitorId; - delete providers[i].monitorId; - monitorsModel.getById(monitorId, function (err, monitor) { - if (err || !monitor) { - providers[i].monitor = null; - } else { - providers[i].monitor = {}; - providers[i].monitor['id'] = monitor._id; - providers[i].monitor['name'] = monitor.name; - } - }); - } else { - providers[i].monitor = null; - } - providersList.push(providers[i]); - if (providers.length === providersList.length) { - res.send(providersList); - return; - } + getMonitorDetail(providers[i], function (data) { + providers[i] = data; + providersList.push(providers[i]); + if (providers.length === providersList.length) { + res.send(providersList); + return; + } + }); + /*var keys = []; keys.push(providers[i].accessKey); keys.push(providers[i].secretKey); @@ -3731,4 +3684,31 @@ function trackSettingWizard(orgId, callback) { callback(null, null); return; } +} +function getMonitorDetail(data, callback) { + data = data.toObject(); + if (data.monitorId) { + var monitorId = data.monitorId; + delete data.monitorId; + monitorsModel.getById(monitorId, function (err, monitor) { + if (err || !monitor) { + data.monitor = null; + } else { + data.monitor = {}; + data.monitor['id'] = monitor._id; + data.monitor['name'] = monitor.name; + data.monitor['type'] = monitor.type; + if (monitor.type === 'sensu') { + data.monitor['parameters'] = {}; + data.monitor['parameters']['url'] = monitor['parameters']['url']; + data.monitor['parameters']['transportProtocol'] = monitor['parameters']['transportProtocol']; + } + } + callback(data); + }); + } else { + delete data['monitorId']; + data.monitor = null; + callback(data); + } } \ No newline at end of file diff --git a/server/nbproject/project.properties b/server/nbproject/project.properties new file mode 100644 index 000000000..b6952134e --- /dev/null +++ b/server/nbproject/project.properties @@ -0,0 +1,4 @@ +file.reference.server-app=app +files.encoding=UTF-8 +site.root.folder=${file.reference.server-app} +source.folder= diff --git a/server/nbproject/project.xml b/server/nbproject/project.xml new file mode 100644 index 000000000..b3106597e --- /dev/null +++ b/server/nbproject/project.xml @@ -0,0 +1,9 @@ + + + org.netbeans.modules.web.clientproject + + + Catalyst + + + From 4383a263cf1e095dc1166314dd768d814d78742d Mon Sep 17 00:00:00 2001 From: Udesh Date: Fri, 28 Oct 2016 14:14:38 +0530 Subject: [PATCH 2/2] removed unwanted files --- server/7VfjUZ6o5qcZGYwVngTiJZJ7.rb | 13 ------------- server/nbproject/project.properties | 4 ---- server/nbproject/project.xml | 9 --------- 3 files changed, 26 deletions(-) delete mode 100644 server/7VfjUZ6o5qcZGYwVngTiJZJ7.rb delete mode 100644 server/nbproject/project.properties delete mode 100644 server/nbproject/project.xml diff --git a/server/7VfjUZ6o5qcZGYwVngTiJZJ7.rb b/server/7VfjUZ6o5qcZGYwVngTiJZJ7.rb deleted file mode 100644 index 5be5bc878..000000000 --- a/server/7VfjUZ6o5qcZGYwVngTiJZJ7.rb +++ /dev/null @@ -1,13 +0,0 @@ -# See https://docs.chef.io/config_rb_knife.html for more information on knife configuration options - -current_dir = File.dirname(__FILE__) -log_level :info -log_location STDOUT -node_name "pcjoshi9" -client_key "#{current_dir}/pcjoshi9.pem" -validation_client_name "cat1-validator" -validation_key "#{current_dir}/cat1-validator.pem" -chef_server_url "https://api.opscode.com/organizations/cat1" -cache_type 'BasicFile' -cache_options( :path => "#{ENV['HOME']}/.chef/checksums" ) -cookbook_path ["#{current_dir}/../cookbooks"] diff --git a/server/nbproject/project.properties b/server/nbproject/project.properties deleted file mode 100644 index b6952134e..000000000 --- a/server/nbproject/project.properties +++ /dev/null @@ -1,4 +0,0 @@ -file.reference.server-app=app -files.encoding=UTF-8 -site.root.folder=${file.reference.server-app} -source.folder= diff --git a/server/nbproject/project.xml b/server/nbproject/project.xml deleted file mode 100644 index b3106597e..000000000 --- a/server/nbproject/project.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - org.netbeans.modules.web.clientproject - - - Catalyst - - -