From 58b5f0fd1b1c39041990e1c8535aca962fd77523 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 21 Sep 2016 12:20:21 +0530 Subject: [PATCH 1/9] CAT-2345/CAT-2346 Fixed --- server/app/routes/v1.0/routes_tasks.js | 97 ++++++++++++++++++++++---- 1 file changed, 83 insertions(+), 14 deletions(-) diff --git a/server/app/routes/v1.0/routes_tasks.js b/server/app/routes/v1.0/routes_tasks.js index 37308b87a..b225dc447 100755 --- a/server/app/routes/v1.0/routes_tasks.js +++ b/server/app/routes/v1.0/routes_tasks.js @@ -26,6 +26,7 @@ var logger = require('_pr/logger')(module); var taskService = require('_pr/services/taskService.js') var async = require('async'); var apiUtil = require('_pr/lib/utils/apiUtil.js'); +var Cryptography = require('_pr/lib/utils/cryptography'); @@ -487,20 +488,53 @@ module.exports.setRoutes = function(app, sessionVerification) { app.post('/tasks/:taskId/update', function(req, res) { var taskData = req.body.taskData; - Tasks.updateTaskById(req.params.taskId, taskData, function(err, updateCount) { - if (err) { - logger.error(err); - res.status(500).send(errorResponses.db.error); - return; - } - if (updateCount) { - res.send({ - updateCount: updateCount - }); - } else { - res.send(400); - } - }); + if(taskData.taskType === 'script'){ + Tasks.getTaskById(req.params.taskId, function(err, scriptTask) { + if (err) { + logger.error(err); + res.status(500).send(errorResponses.db.error); + return; + } + encryptedParam(taskData.scriptDetails,scriptTask.taskConfig.scriptDetails, function (err, encryptedParam) { + if (err) { + logger.error(err); + res.status(500).send("Failed to encrypted script parameters: ", err); + return; + } else { + taskData.scriptDetails = encryptedParam; + Tasks.updateTaskById(req.params.taskId, taskData, function (err, updateCount) { + if (err) { + logger.error(err); + res.status(500).send(errorResponses.db.error); + return; + } + if (updateCount) { + res.send({ + updateCount: updateCount + }); + } else { + res.send(400); + } + }); + } + }) + }); + }else { + Tasks.updateTaskById(req.params.taskId, taskData, function (err, updateCount) { + if (err) { + logger.error(err); + res.status(500).send(errorResponses.db.error); + return; + } + if (updateCount) { + res.send({ + updateCount: updateCount + }); + } else { + res.send(400); + } + }); + } }); app.post('/tasks/:taskId/resultUrl/remove', function(req, res) { @@ -541,3 +575,38 @@ module.exports.setRoutes = function(app, sessionVerification) { }); }; + +function encryptedParam(paramDetails,existingParams,callback){ + var cryptoConfig = appConfig.cryptoSettings; + var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); + var count = 0; + var encryptedList = []; + for(var i = 0; i < paramDetails.length; i++){ + (function(param){ + if(param.scriptParameters.length > 0){ + count++; + for(var j = 0; j < param.scriptParameters.length; j++){ + (function(scriptParameter){ + if(scriptParameter === existingParams[i].scriptParameters[j]){ + encryptedList.push(scriptParameter); + }else { + var encryptedText = cryptography.encryptText(scriptParameter, cryptoConfig.encryptionEncoding, + cryptoConfig.decryptionEncoding); + encryptedList.push(encryptedText); + } + if(encryptedList.length === param.scriptParameters.length){ + param.scriptParameters = encryptedList; + encryptedList = []; + } + })(param.scriptParameters[j]); + } + }else{ + count++; + } + if(count === paramDetails.length){ + callback(null,paramDetails); + return; + } + })(paramDetails[i]); + } +} From 8dbce2a8dad7f909d0eb6dd8f5e23ab9e50a6f2e Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Wed, 21 Sep 2016 12:20:48 +0530 Subject: [PATCH 2/9] CAT-2345/CAT-2346 Fixed --- client/htmls/private/js/scriptList.js | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/client/htmls/private/js/scriptList.js b/client/htmls/private/js/scriptList.js index 1d189e8e2..93cdfc55a 100644 --- a/client/htmls/private/js/scriptList.js +++ b/client/htmls/private/js/scriptList.js @@ -244,23 +244,6 @@ $('#scriptForm').submit(function(e) { var formData = new FormData(); formData.append('file', $('input[type=file]')[0].files[0]); var methodName =''; - if(scriptEditNew === "edit") { - if(hiddenFileName === availableFileName) { - url = '../scripts/update/scriptData'; - methodName = 'PUT'; - reqBody = { - "scriptId": scriptId, - "name": name, - "type": type, - "description": description, - "orgDetails": orgDetails, - "fileId": fileId - }; - formSave(methodName,url,reqBody); - return false; - } - } - var isValidator = $('#scriptForm').valid(); if(isValidator){ e.preventDefault(); From c268ff19dc94f9123e3e35ed54e759c8565eaded Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Thu, 22 Sep 2016 11:40:12 +0530 Subject: [PATCH 3/9] CAT-2347 Fixed and docker uat flow parameters in blueprint implementation --- .../orchestration/popups/newTask.html | 4 +- server/app/lib/route53.js | 77 +++++++++++++ server/app/model/classes/tasks/tasks.js | 66 +++++++++++- server/app/services/resourceService.js | 102 +++++++++++++++++- 4 files changed, 243 insertions(+), 6 deletions(-) create mode 100644 server/app/lib/route53.js diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html index 89499be44..855fd7d89 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html @@ -453,7 +453,8 @@
Script Details
- {{param}} + {{param}} + ..... @@ -470,7 +471,6 @@
Script Details
-
diff --git a/server/app/lib/route53.js b/server/app/lib/route53.js new file mode 100644 index 000000000..77edc0244 --- /dev/null +++ b/server/app/lib/route53.js @@ -0,0 +1,77 @@ +/* + Copyright [2016] [Relevance Lab] + loLicensed 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. + See the License for the specific language governing permissions and + limitations under the License. + */ + + +var aws = require('aws-sdk'); +var logger = require('_pr/logger')(module); +var appConfig = require('_pr/config'); + +if (process.env.http_proxy) { + aws.config.update({ + httpOptions: { + proxy: process.env.http_proxy + } + }); +} + +var route53 = function(awsSettings) { + + var that = this; + var params = new Object(); + + if (typeof awsSettings.region !== undefined) { + params.region = awsSettings.region; + } + if (typeof awsSettings.access_key !== undefined && typeof awsSettings.secret_key !== undefined) { + params.accessKeyId = awsSettings.access_key; + params.secretAccessKey = awsSettings.secret_key; + } + var awsRoute53 = new aws.Route53(params); + + this.listHostedZones = function(params,callback) { + awsRoute53.listHostedZones(params, function (err, data) { + if (err) { + logger.debug("Got listHostedZones info with error: ", err); + callback(err, null); + return; + } + callback(null,data ); + }); + }; + + this.listResourceRecordSets = function(params,callback) { + awsRoute53.listResourceRecordSets(params,function (err, data) { + if (err) { + logger.debug("Got getObject info with error: ", err); + callback(err, null); + return; + } + callback(null,data); + }); + }; + + this.changeResourceRecordSets = function(params, callback) { + awsRoute53.changeResourceRecordSets(params, function (err, data) { + if (err) { + logger.debug("Got getObject info with error: ", err); + callback(err, null); + return; + } + callback(null,data); + }); + }; +} + +module.exports = route53; \ No newline at end of file diff --git a/server/app/model/classes/tasks/tasks.js b/server/app/model/classes/tasks/tasks.js index d10402538..10f31decb 100755 --- a/server/app/model/classes/tasks/tasks.js +++ b/server/app/model/classes/tasks/tasks.js @@ -503,7 +503,19 @@ taskSchema.statics.getTasksByOrgBgProjectAndEnvId = function(jsonData, callback) err.status = 500; return callback(err,null); } - callback(null, tasks); + if(tasks.docs.length > 0){ + filterScriptTaskData(tasks.docs,function(err,filterData){ + if(err){ + logger.error(err); + callback(err, null); + return; + } + tasks.docs = filterData; + callback(null,tasks); + }) + }else{ + callback(null, tasks); + } }); } else { var queryObj = { @@ -512,14 +524,24 @@ taskSchema.statics.getTasksByOrgBgProjectAndEnvId = function(jsonData, callback) projectId: jsonData.projectId, envId: jsonData.envId } - this.find(queryObj, function(err, data) { if (err) { logger.error(err); callback(err, null); return; } - callback(null, data); + if(data.length > 0){ + filterScriptTaskData(data,function(err,filterData){ + if(err){ + logger.error(err); + callback(err, null); + return; + } + callback(null,filterData); + }) + }else{ + callback(null, data); + } }); } }; @@ -822,6 +844,44 @@ taskSchema.statics.updateTaskConfig = function updateTaskConfig(taskId, taskConf }); }; +function filterScriptTaskData(data,callback){ + var taskList = []; + for(var i = 0; i < data.length; i++){ + (function(task){ + if(task.taskType === 'script'){ + if(task.taskConfig.scriptDetails.length > 0){ + for(var j = 0;j < task.taskConfig.scriptDetails.length;j++) { + (function (scriptTask) { + if(scriptTask.scriptParameters.length > 0){ + var count = 0; + for(var k = 0; k < scriptTask.scriptParameters.length;k++){ + (function(params){ + count++; + scriptTask.scriptParameters[k] = ''; + if(count === scriptTask.scriptParameters.length){ + taskList.push(task) + } + })(scriptTask.scriptParameters[k]); + } + }else{ + taskList.push(task) + } + })(task.taskConfig.scriptDetails[j]); + } + }else{ + taskList.push(task) + } + }else{ + taskList.push(task); + } + })(data[i]); + if(taskList.length === data.length){ + callback(null,taskList); + return; + } + } +} + var Tasks = mongoose.model('Tasks', taskSchema); module.exports = Tasks; diff --git a/server/app/services/resourceService.js b/server/app/services/resourceService.js index be40c6013..35d4c6ee2 100644 --- a/server/app/services/resourceService.js +++ b/server/app/services/resourceService.js @@ -19,6 +19,7 @@ var aws = require('aws-sdk'); var resources = require('_pr/model/resources/resources'); var CW = require('_pr/lib/cloudwatch.js'); var S3 = require('_pr/lib/s3.js'); +var Route53 = require('_pr/lib/route53.js'); var EC2 = require('_pr/lib/ec2.js'); var RDS = require('_pr/lib/rds.js'); var resourceCost = require('_pr/model/resource-costs'); @@ -39,6 +40,7 @@ resourceService.bulkUpdateResourceProviderTags=bulkUpdateResourceProviderTags; resourceService.bulkUpdateUnassignedResourceTags=bulkUpdateUnassignedResourceTags; resourceService.bulkUpdateAWSResourcesTags=bulkUpdateAWSResourcesTags; resourceService.getEC2InstancesInfo=getEC2InstancesInfo; +resourceService.updateDomainNameForInstance=updateDomainNameForInstance; function getCostForResources(updatedTime,provider,bucketNames,instanceIds,dbInstanceNames,fileName, callback) { @@ -792,7 +794,7 @@ function getBucketsInfo(provider,orgName,callback) { var s3Config = { access_key: decryptedAccessKey, secret_key: decryptedSecretKey, - region: "us-east-1" + region: "us-west-1" }; var s3 = new S3(s3Config); s3.getBucketList(function(err,data){ @@ -1195,3 +1197,101 @@ function getStartTime(endTime, period){ var subtractedDate = new Date(subtractedDateInMilliSeconds); return dateUtil.getDateInUTC(subtractedDate); } + +function updateDomainNameForInstance(domainName,publicIP,accessDetails,callback){ + var cryptoConfig = appConfig.cryptoSettings; + var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); + var decryptedAccessKey = cryptography.decryptText(accessDetails.accessKey, + cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding); + var decryptedSecretKey = cryptography.decryptText(accessDetails.secretKey, + cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding); + var route53Config = { + access_key: decryptedAccessKey, + secret_key: decryptedSecretKey, + region:accessDetails.region + }; + var route53 = new Route53(route53Config); + async.waterfall([ + function(next){ + route53.listHostedZones({},next); + }, + function(hostedZones,next){ + if(hostedZones.HostedZones.length > 0){ + var count = 0,resourceCount = 0; + var params = {}; + for(var i = 0; i < hostedZones.HostedZones.length; i++) { + (function (hostedZone) { + count++; + route53.listResourceRecordSets({HostedZoneId:hostedZone.Id}, function(err,resourceData) { + if(err){ + next(err,null); + }else { + for(var j = 0;j < resourceData.ResourceRecordSets.length;j++) { + (function (resourceRecord) { + resourceCount++; + if(resourceRecord.ResourceRecords.length === 1 && resourceRecord.ResourceRecords[0].Value === '54.67.41.5'){ + params = { + ChangeBatch: { + Changes: [ + { + Action: 'UPSERT', + ResourceRecordSet: { + Name: 'demoServer.rlcatalyst.com', + Type: resourceData.ResourceRecordSets[j].Type, + TTL: resourceData.ResourceRecordSets[j].TTL, + ResourceRecords: resourceData.ResourceRecordSets[j].ResourceRecords + } + } + ] + }, + HostedZoneId: hostedZone.Id + } + }else{ + for(var k = 0; k < resourceRecord.ResourceRecords.length; k++ ){ + if(resourceRecord.ResourceRecords[k].Value === '54.67.41.5'){ + params = { + ChangeBatch: { + Changes: [ + { + Action: 'UPSERT', + ResourceRecordSet: { + Name: 'demoServer.rlcatalyst.com', + Type: resourceData.ResourceRecordSets[j].Type, + TTL: resourceData.ResourceRecordSets[j].TTL, + ResourceRecords: resourceData.ResourceRecordSets[j].ResourceRecords + } + } + ] + }, + HostedZoneId: hostedZone.Id + } + } + } + } + })(resourceData.ResourceRecordSets[j]); + } + if(count === hostedZones.HostedZones.length && resourceCount === resourceData.ResourceRecordSets.length){ + next(null,params); + } + } + }); + })(hostedZones.HostedZones[i]); + } + }else{ + next(null,null); + } + }, + function(params,next){ + route53.changeResourceRecordSets(params,next); + } + + ],function(err,results){ + if(err){ + callback(err,null); + return; + } + callback(null,results); + return; + }) +} + From cad5ea4eeae92d3c52015a46f0089c1770b21ff7 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Thu, 22 Sep 2016 18:58:10 +0530 Subject: [PATCH 4/9] Docker UAT Implementation --- client/cat3/src/factory/workzoneServices.js | 4 +- .../blueprint/popups/blueprintLaunchCtrl.js | 2 +- .../popups/blueprintLaunchParams.html | 26 ++++- .../popups/blueprintLaunchParamsCtrl.js | 13 ++- server/app/cronjobs/cron-jobs.js | 8 +- .../DockerContainerSync.js | 1 + .../aws-blueprint/aws-blueprint.js | 12 ++- server/app/model/blueprint/blueprint.js | 2 + server/app/routes/v1.0/routes_blueprints.js | 13 ++- server/app/services/resourceService.js | 95 ++++++++++++++----- 10 files changed, 134 insertions(+), 42 deletions(-) diff --git a/client/cat3/src/factory/workzoneServices.js b/client/cat3/src/factory/workzoneServices.js index d42205a56..a0eefc21f 100644 --- a/client/cat3/src/factory/workzoneServices.js +++ b/client/cat3/src/factory/workzoneServices.js @@ -99,9 +99,9 @@ var url = '/blueprints/' + blueprintID; return $http.delete(fullUrl(url), Auth.getHeaderObject()); }, - launchBlueprint: function (blueprintID, version, envId, stackName) { + launchBlueprint: function (blueprintID, version, envId, stackName,domainName) { var url = '/blueprints/' + blueprintID + '/launch?version=' + version + - '&envId=' + envId + '&stackName=' + stackName; + '&envId=' + envId + '&stackName=' + stackName + '&domainName=' + domainName; return $http.get(fullUrl(url), Auth.getHeaderObject()); }, getBlueprintById: function(blueprintId) { diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js index 5839b6065..6527ef150 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js @@ -79,7 +79,7 @@ versionOptional = versionsList[versionsList.length-1].ver; } var selectedVersionBpId = bpItem.bp.selectedVersionBpId; - workzoneServices.launchBlueprint(selectedVersionBpId, versionOptional, envParams.env, bpItem.stackName).then(function(bpLaunchResponse) { + workzoneServices.launchBlueprint(selectedVersionBpId, versionOptional, envParams.env, bpItem.stackName,bpItem.domainName).then(function(bpLaunchResponse) { $scope.isBPLogsLoading = false; var launchingInstance; if(bpLaunchResponse.data.id && bpLaunchResponse.data.id.length>0){ diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html index 41cc3064c..44af0b48d 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParams.html @@ -1,14 +1,15 @@
× -

Confirmation

+

Confirmation

Enter a Unique Stack Name

+

Enter a Domain Name

Enter ARM Deployment Name

-
Are you sure you want to launch the Blueprint? Press Ok To continue
+
Are you sure you want to launch the Blueprint? Press Ok To continue
(Only numbers,letters allowed. No spaces and underscores) @@ -18,10 +19,23 @@

Enter ARM Deployment Name

+ +
+ (Only letters allowed. No spaces and underscores) + + +
+
+

Only letters allowed. No spaces and underscores.

+
+
+ +
+
-
+
@@ -36,6 +50,12 @@

Enter ARM Deployment Name

+
+ + +
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js index 00e97c895..65efb4d6d 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js @@ -11,21 +11,21 @@ .controller('blueprintLaunchParamsCtrl', ['$scope', '$modalInstance', 'items', function($scope, $modalInstance, items) { var launchHelper = { launch : function(){ - $modalInstance.close({bp:items,stackName:$scope.stackName}); + $modalInstance.close({bp:items,stackName:$scope.stackName,domainName:$scope.domainName}); } }; $scope.stackName=''; + $scope.domainName=''; $scope.cancel = function() { $modalInstance.dismiss('cancel'); }; $scope.launchBP = function() { if(items.blueprintType === "aws_cf") { $scope.showCFTInputs = true; - } else if(items.blueprintType === "azure_arm") { + }else if(items.blueprintType === "azure_arm") { $scope.showARMInputs = true; - } - else { - launchHelper.launch(); + }else { + $scope.showBlueprintInputs = true; } }; $scope.confirmCFTLaunch = function(){ @@ -36,6 +36,9 @@ $scope.confirmCFTLaunch(); } }; + $scope.launchBPWithDomainName = function(){ + launchHelper.launch(); + }; } ]); })(angular); diff --git a/server/app/cronjobs/cron-jobs.js b/server/app/cronjobs/cron-jobs.js index 04e48d3f4..97904b43d 100644 --- a/server/app/cronjobs/cron-jobs.js +++ b/server/app/cronjobs/cron-jobs.js @@ -28,18 +28,18 @@ var chefSync = require('_pr/cronjobs/chef-sync'); module.exports.start = function start() { - logger.info('Cost aggregation started with interval ==> '+ costAggregation.getInterval()); + /*logger.info('Cost aggregation started with interval ==> '+ costAggregation.getInterval()); var costAggregationJobId = crontab.scheduleJob(costAggregation.getInterval(), costAggregation.execute); logger.info('Usage aggregation started with interval ==> '+ usageAggregation.getInterval()); var usageAggregationJobId - = crontab.scheduleJob(usageAggregation.getInterval(), usageAggregation.execute); + = crontab.scheduleJob(usageAggregation.getInterval(), usageAggregation.execute);*/ logger.info('Provider Sync started with interval ==> '+ providerSync.getInterval()); var providerSyncJobId = crontab.scheduleJob(providerSync.getInterval(), providerSync.execute); - logger.info('Tags aggregation started with interval ==> '+ providerTagsAggregation.getInterval()); + /*logger.info('Tags aggregation started with interval ==> '+ providerTagsAggregation.getInterval()); var providerTagsAggregationJobId = crontab.scheduleJob(providerTagsAggregation.getInterval(), providerTagsAggregation.execute); @@ -53,6 +53,6 @@ module.exports.start = function start() { logger.info('Chef Sync started with interval ==> '+ chefSync.getInterval()); var chefSyncJobId - = crontab.scheduleJob(chefSync.getInterval(), chefSync.execute); + = crontab.scheduleJob(chefSync.getInterval(), chefSync.execute);*/ } \ No newline at end of file diff --git a/server/app/cronjobs/docker-container-sync/DockerContainerSync.js b/server/app/cronjobs/docker-container-sync/DockerContainerSync.js index 7a5df35cc..04fceb8fb 100644 --- a/server/app/cronjobs/docker-container-sync/DockerContainerSync.js +++ b/server/app/cronjobs/docker-container-sync/DockerContainerSync.js @@ -240,6 +240,7 @@ function saveAndUpdateContainers(containers,containerIds,instanceId,next){ return; }else{ count++; + if(count === containers.length){ next(null,containers); } 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 c39748e9a..37bbbda7e 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 @@ -36,6 +36,7 @@ var credentialcryptography = require('_pr/lib/credentialcryptography'); var masterUtil = require('_pr/lib/utils/masterUtil.js'); var instanceLogModel = require('_pr/model/log-trail/instanceLog.js'); var Schema = mongoose.Schema; +var resourceService = require('_pr/services/resourceService'); var AWSInstanceBlueprintSchema = new Schema({ keyPairId: { @@ -90,6 +91,7 @@ var AWSInstanceBlueprintSchema = new Schema({ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) { var self = this; + var domainName = launchParams.domainName; VMImage.getImageById(self.imageId, function(err, anImage) { if (err) { logger.error(err); @@ -361,7 +363,6 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) { } logger.debug('Instance ip upadated'); }); - instancesDao.updateInstanceState(instance.id, instanceData.State.Name, function(err, updateCount) { if (err) { logger.error("error(date instance state err ==>", err); @@ -558,6 +559,15 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) { log: "Instance Bootstraped successfully", timestamp: timestampEnded }); + if(typeof domainName !== 'undefined' && domainName !== '' && domainName !== null) { + resourceService.updateDomainNameForInstance(domainName, instance.instanceIP, awsSettings, function (err, updateDomainName) { + if (err) { + logger.error("resourceService.updateDomainNameForInstance Failed ==>", err); + return; + } + logger.debug("Domain name is updated successfully"); + }); + } instancesDao.updateActionLog(instance.id, actionLog._id, true, timestampEnded); diff --git a/server/app/model/blueprint/blueprint.js b/server/app/model/blueprint/blueprint.js index 57c2c8bfa..80e3cc214 100755 --- a/server/app/model/blueprint/blueprint.js +++ b/server/app/model/blueprint/blueprint.js @@ -316,6 +316,7 @@ BlueprintSchema.methods.launch = function(opts, callback) { envName: envName, envId: opts.envId, stackName: opts.stackName, + domainName:opts.domainName, blueprintName: self.name, orgId: self.orgId, orgName: project[0].orgname, @@ -338,6 +339,7 @@ BlueprintSchema.methods.launch = function(opts, callback) { envName: envName, envId: opts.envId, stackName: opts.stackName, + domainName:opts.domainName, blueprintName: self.name, orgId: self.orgId, orgName: project[0].orgname, diff --git a/server/app/routes/v1.0/routes_blueprints.js b/server/app/routes/v1.0/routes_blueprints.js index 465409bbb..5c6b26acd 100755 --- a/server/app/routes/v1.0/routes_blueprints.js +++ b/server/app/routes/v1.0/routes_blueprints.js @@ -390,7 +390,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { } var stackName = null; - + var domainName = null; if (blueprint.blueprintType === 'aws_cf' || blueprint.blueprintType === 'azure_arm') { stackName = req.query.stackName; if (!stackName) { @@ -399,13 +399,22 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { }); return; } + }else { + domainName = req.query.domainName; + if (!domainName) { + res.send(400, { + message: "Invalid domainName" + }); + return; + } } blueprint.launch({ envId: req.query.envId, ver: req.query.version, stackName: stackName, - sessionUser: req.session.user.cn, + domainName:domainName, + sessionUser: req.session.user.cn }, function(err, launchData) { if (err) { res.status(500).send({ diff --git a/server/app/services/resourceService.js b/server/app/services/resourceService.js index 35d4c6ee2..3ae364e6d 100644 --- a/server/app/services/resourceService.js +++ b/server/app/services/resourceService.js @@ -869,6 +869,16 @@ function getEC2InstancesInfo(provider,orgName,callback) { access_key: decryptedAccessKey, secret_key: decryptedSecretKey }; + var awsConfig ={ + access_key: decryptedAccessKey, + secret_key: decryptedSecretKey, + region:'us-west-1' + } + updateDomainNameForInstance('srikant','52.53.170.111',awsConfig,function(err){ + if(!err){ + logger.debug("Update successfully"); + } + }) var regionCount = 0; var regions = appConfig.aws.regions; var awsInstanceList=[]; @@ -1198,27 +1208,20 @@ function getStartTime(endTime, period){ return dateUtil.getDateInUTC(subtractedDate); } -function updateDomainNameForInstance(domainName,publicIP,accessDetails,callback){ - var cryptoConfig = appConfig.cryptoSettings; - var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password); - var decryptedAccessKey = cryptography.decryptText(accessDetails.accessKey, - cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding); - var decryptedSecretKey = cryptography.decryptText(accessDetails.secretKey, - cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding); - var route53Config = { - access_key: decryptedAccessKey, - secret_key: decryptedSecretKey, - region:accessDetails.region - }; - var route53 = new Route53(route53Config); +function updateDomainNameForInstance(domainName,publicIP,awsSettings,callback){ + console.log(domainName); + console.log(publicIP); + console.log(awsSettings); + var route53 = new Route53(awsSettings); async.waterfall([ - function(next){ + /* function(next){ route53.listHostedZones({},next); }, function(hostedZones,next){ if(hostedZones.HostedZones.length > 0){ var count = 0,resourceCount = 0; var params = {}; + var paramList = []; for(var i = 0; i < hostedZones.HostedZones.length; i++) { (function (hostedZone) { count++; @@ -1229,14 +1232,15 @@ function updateDomainNameForInstance(domainName,publicIP,accessDetails,callback) for(var j = 0;j < resourceData.ResourceRecordSets.length;j++) { (function (resourceRecord) { resourceCount++; - if(resourceRecord.ResourceRecords.length === 1 && resourceRecord.ResourceRecords[0].Value === '54.67.41.5'){ + if(resourceRecord.ResourceRecords.length === 1 && resourceRecord.ResourceRecords[0].Value === publicIP){ + console.log(JSON.stringify(resourceRecord)); params = { ChangeBatch: { Changes: [ { - Action: 'UPSERT', + Action: 'DELETE', ResourceRecordSet: { - Name: 'demoServer.rlcatalyst.com', + Name: resourceData.ResourceRecordSets[j].Name, Type: resourceData.ResourceRecordSets[j].Type, TTL: resourceData.ResourceRecordSets[j].TTL, ResourceRecords: resourceData.ResourceRecordSets[j].ResourceRecords @@ -1246,16 +1250,17 @@ function updateDomainNameForInstance(domainName,publicIP,accessDetails,callback) }, HostedZoneId: hostedZone.Id } + paramList.push(params); }else{ for(var k = 0; k < resourceRecord.ResourceRecords.length; k++ ){ - if(resourceRecord.ResourceRecords[k].Value === '54.67.41.5'){ + if(resourceRecord.ResourceRecords[k].Value === publicIP){ params = { ChangeBatch: { Changes: [ { - Action: 'UPSERT', + Action: 'DELETE', ResourceRecordSet: { - Name: 'demoServer.rlcatalyst.com', + Name: resourceData.ResourceRecordSets[j].Name, Type: resourceData.ResourceRecordSets[j].Type, TTL: resourceData.ResourceRecordSets[j].TTL, ResourceRecords: resourceData.ResourceRecordSets[j].ResourceRecords @@ -1265,13 +1270,14 @@ function updateDomainNameForInstance(domainName,publicIP,accessDetails,callback) }, HostedZoneId: hostedZone.Id } + paramList.push(params); } } } })(resourceData.ResourceRecordSets[j]); } if(count === hostedZones.HostedZones.length && resourceCount === resourceData.ResourceRecordSets.length){ - next(null,params); + next(null,paramList); } } }); @@ -1280,9 +1286,50 @@ function updateDomainNameForInstance(domainName,publicIP,accessDetails,callback) }else{ next(null,null); } - }, - function(params,next){ - route53.changeResourceRecordSets(params,next); + },*/ + function(next){ + var params = { + "ChangeBatch": { + "Changes": [{ + "Action": "UPSERT", + "ResourceRecordSet": { + "Name": "gobinda.rlcatalyst.com.", + "Type": "CNAME", + "TTL": 30, + "ResourceRecords": [{ + "Value": "custdocker.rlcatalyst.com." + }] + } + }] + }, + "HostedZoneId": "/hostedzone/Z2BRKRLMFMHOFF" + } + /*console.log("***********************"); + console.log(paramList.length); + console.log(paramList); + if(paramList.length > 0){ + console.log("Durgesh Kumar Sharma"); + var count = 0; + for(var i = 0; i < paramList.length;i++){ + (function(params){ + console.log(JSON.stringify(params)); + route53.changeResourceRecordSets(params,function(err,data){ + count++; + if(err){ + next(err,null); + } + if(count === paramList.length){ + next(null,paramList); + } + }); + })(paramList[i]); + + } + + }else{ + console.log("Ramesh");*/ + route53.changeResourceRecordSets(params,next); + //} } ],function(err,results){ From c4d6681705419ee29ee5d75eb0c92f1bf6ac7127 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Fri, 23 Sep 2016 11:52:09 +0530 Subject: [PATCH 5/9] Docker UAT Blueprint Changes --- .../aws-blueprint/aws-blueprint.js | 4 +- server/app/services/resourceService.js | 48 ++++--------------- 2 files changed, 12 insertions(+), 40 deletions(-) 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 37bbbda7e..8c4724a5e 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 @@ -544,7 +544,7 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) { instanceLog.actionStatus = "success"; instanceLog.logs = { err: false, - log: "Instance Bootstraped successfully", + log: "Instance Bootstrapped successfully", timestamp: new Date().getTime() }; instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function(err, logData) { @@ -556,7 +556,7 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) { logsDao.insertLog({ referenceId: logsReferenceIds, err: false, - log: "Instance Bootstraped successfully", + log: "Instance Bootstrapped successfully", timestamp: timestampEnded }); if(typeof domainName !== 'undefined' && domainName !== '' && domainName !== null) { diff --git a/server/app/services/resourceService.js b/server/app/services/resourceService.js index 3ae364e6d..ea12d79b8 100644 --- a/server/app/services/resourceService.js +++ b/server/app/services/resourceService.js @@ -874,11 +874,11 @@ function getEC2InstancesInfo(provider,orgName,callback) { secret_key: decryptedSecretKey, region:'us-west-1' } - updateDomainNameForInstance('srikant','52.53.170.111',awsConfig,function(err){ + /*updateDomainNameForInstance('srikant','54.153.115.175',awsConfig,function(err){ if(!err){ logger.debug("Update successfully"); } - }) + })*/ var regionCount = 0; var regions = appConfig.aws.regions; var awsInstanceList=[]; @@ -1209,12 +1209,9 @@ function getStartTime(endTime, period){ } function updateDomainNameForInstance(domainName,publicIP,awsSettings,callback){ - console.log(domainName); - console.log(publicIP); - console.log(awsSettings); var route53 = new Route53(awsSettings); async.waterfall([ - /* function(next){ + function(next){ route53.listHostedZones({},next); }, function(hostedZones,next){ @@ -1233,12 +1230,11 @@ function updateDomainNameForInstance(domainName,publicIP,awsSettings,callback){ (function (resourceRecord) { resourceCount++; if(resourceRecord.ResourceRecords.length === 1 && resourceRecord.ResourceRecords[0].Value === publicIP){ - console.log(JSON.stringify(resourceRecord)); params = { ChangeBatch: { Changes: [ { - Action: 'DELETE', + Action: 'UPSERT', ResourceRecordSet: { Name: resourceData.ResourceRecordSets[j].Name, Type: resourceData.ResourceRecordSets[j].Type, @@ -1258,7 +1254,7 @@ function updateDomainNameForInstance(domainName,publicIP,awsSettings,callback){ ChangeBatch: { Changes: [ { - Action: 'DELETE', + Action: 'UPSERT', ResourceRecordSet: { Name: resourceData.ResourceRecordSets[j].Name, Type: resourceData.ResourceRecordSets[j].Type, @@ -1286,33 +1282,12 @@ function updateDomainNameForInstance(domainName,publicIP,awsSettings,callback){ }else{ next(null,null); } - },*/ - function(next){ - var params = { - "ChangeBatch": { - "Changes": [{ - "Action": "UPSERT", - "ResourceRecordSet": { - "Name": "gobinda.rlcatalyst.com.", - "Type": "CNAME", - "TTL": 30, - "ResourceRecords": [{ - "Value": "custdocker.rlcatalyst.com." - }] - } - }] - }, - "HostedZoneId": "/hostedzone/Z2BRKRLMFMHOFF" - } - /*console.log("***********************"); - console.log(paramList.length); - console.log(paramList); - if(paramList.length > 0){ - console.log("Durgesh Kumar Sharma"); + }, + function(paramList,next){ + if(paramList.length > 0){ var count = 0; for(var i = 0; i < paramList.length;i++){ (function(params){ - console.log(JSON.stringify(params)); route53.changeResourceRecordSets(params,function(err,data){ count++; if(err){ @@ -1325,13 +1300,10 @@ function updateDomainNameForInstance(domainName,publicIP,awsSettings,callback){ })(paramList[i]); } - }else{ - console.log("Ramesh");*/ - route53.changeResourceRecordSets(params,next); - //} + next(null,paramList); + } } - ],function(err,results){ if(err){ callback(err,null); From 884f8e3eb39f09f1626d52019c9d4a5f9245cff5 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Fri, 23 Sep 2016 11:55:36 +0530 Subject: [PATCH 6/9] CAT-2347 Fixed --- server/app/routes/v1.0/routes_tasks.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/app/routes/v1.0/routes_tasks.js b/server/app/routes/v1.0/routes_tasks.js index b225dc447..bb1eab464 100755 --- a/server/app/routes/v1.0/routes_tasks.js +++ b/server/app/routes/v1.0/routes_tasks.js @@ -587,7 +587,9 @@ function encryptedParam(paramDetails,existingParams,callback){ count++; for(var j = 0; j < param.scriptParameters.length; j++){ (function(scriptParameter){ - if(scriptParameter === existingParams[i].scriptParameters[j]){ + if(scriptParameter === ''){ + encryptedList.push(existingParams[i].scriptParameters[j]); + }else if(scriptParameter === existingParams[i].scriptParameters[j]){ encryptedList.push(scriptParameter); }else { var encryptedText = cryptography.encryptText(scriptParameter, cryptoConfig.encryptionEncoding, From 2a02d06fc550864c4c5841ca7dac8c1d37997c92 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Fri, 23 Sep 2016 18:49:49 +0530 Subject: [PATCH 7/9] Docker UAT Blueprint Info Implementation --- .../popups/blueprintLaunchParamsCtrl.js | 4 ++- client/htmls/private/ajax/Aws-Production.html | 11 +++++++ .../htmls/private/ajax/DesignBlueprint.html | 11 +++++++ .../private/ajax/DesignBlueprintAzure.html | 11 +++++++ .../private/ajax/DesignBlueprintVmware.html | 11 +++++++ client/htmls/private/js/dev/awsProduction.js | 2 +- server/app/cronjobs/cron-jobs.js | 10 +++---- .../aws-blueprint/aws-blueprint.js | 2 -- server/app/model/blueprint/blueprint.js | 8 ++++- .../app/routes/v1.0/routes_organizations.js | 10 ++++--- server/app/services/resourceService.js | 29 ++++++++++--------- 11 files changed, 82 insertions(+), 27 deletions(-) diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js index 65efb4d6d..d3ac3b9a0 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js @@ -24,8 +24,10 @@ $scope.showCFTInputs = true; }else if(items.blueprintType === "azure_arm") { $scope.showARMInputs = true; - }else { + }else if(items.domainNameCheck === true || items.domainNameCheck === "true") { $scope.showBlueprintInputs = true; + }else { + launchHelper.launch(); } }; $scope.confirmCFTLaunch = function(){ diff --git a/client/htmls/private/ajax/Aws-Production.html b/client/htmls/private/ajax/Aws-Production.html index 90f2c5e53..ab620da36 100644 --- a/client/htmls/private/ajax/Aws-Production.html +++ b/client/htmls/private/ajax/Aws-Production.html @@ -182,6 +182,17 @@

+
+ +
+
+ +
+
+ +
+
+
diff --git a/client/htmls/private/ajax/DesignBlueprint.html b/client/htmls/private/ajax/DesignBlueprint.html index 4dadd7215..289bcc4ed 100644 --- a/client/htmls/private/ajax/DesignBlueprint.html +++ b/client/htmls/private/ajax/DesignBlueprint.html @@ -140,6 +140,17 @@

+
+ +
+
+ +
+
+ +
+
+
diff --git a/client/htmls/private/ajax/DesignBlueprintAzure.html b/client/htmls/private/ajax/DesignBlueprintAzure.html index 5359540a0..ff8681de2 100644 --- a/client/htmls/private/ajax/DesignBlueprintAzure.html +++ b/client/htmls/private/ajax/DesignBlueprintAzure.html @@ -187,6 +187,17 @@

+
+ +
+
+ +
+
+ +
+
+
diff --git a/client/htmls/private/ajax/DesignBlueprintVmware.html b/client/htmls/private/ajax/DesignBlueprintVmware.html index 52ffee3d2..9a152573e 100644 --- a/client/htmls/private/ajax/DesignBlueprintVmware.html +++ b/client/htmls/private/ajax/DesignBlueprintVmware.html @@ -116,6 +116,17 @@

+
+ +
+
+ +
+
+ +
+
+