Skip to content

Change routes files in settings for customer #1163

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 20, 2017
Merged

Change routes files in settings for customer #1163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions ...pp/model/blueprint/blueprint-types/cloud-formation-blueprint/cloud-formation-blueprint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,10 +549,6 @@ CloudFormationBlueprintSchema.methods.launch = function (launchParams, callback)
}
});
if (nodeIdWithActionLogId.length === instances.length && launchParams.auditTrailId !== null) {
var nodeIds = [];
for(var i = 0; i < nodeIdWithActionLogId.length;i++){
nodeIds.push(nodeIdWithActionLogId[i].nodeId);
}
var resultTaskExecution = {
"actionLogId": logsReferenceIds[1],
"auditTrailConfig.nodeIdsWithActionLog": nodeIdWithActionLogId,
Expand Down
3 changes: 3 additions & 0 deletions server/app/routes/v1.0/routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ var configData = require('./routes_config_data');
var monitors = require('./routes_monitors');
var bots = require('./routes_bots');
var gitHub = require('./routes_github');
var routesCICD = require('./routes_d4dMastersCICD');
/*
* @TODO
* Change app to router in internal routes files
Expand Down Expand Up @@ -193,6 +194,8 @@ module.exports.setRoutes = function(app) {

gitHub.setRoutes(app, sessionVerificationFunc);

routesCICD.setRoutes(app, sessionVerificationFunc);


app.get('/', function(req, res) {
res.redirect('/cat3');
Expand Down
85 changes: 83 additions & 2 deletions server/app/routes/v1.0/routes_d4dMasters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,48 @@ module.exports.setRoutes = function (app, sessionVerification) {
return;
});

} else if (req.params.id === '6') {
} else if (req.params.id === '27') {
// For BitBucket
masterUtil.getBitbucket(orgList, function(err, bitbucketList) {
if (err) {
res.status(500).send('Not able to fetch Bitbucket.');
}
res.send(bitbucketList);
return;
});

} else if (req.params.id === '28') {
// For Octopus
masterUtil.getOctopus(orgList, function(err, octopusList) {
if (err) {
res.status(500).send('Not able to fetch Octopus.');
}
res.send(octopusList);
return;
});

} else if (req.params.id === '29') {
// For QA Portal
masterUtil.getFunctionalTest(orgList, function(err, functionaltestlist) {
if (err) {
res.status(500).send('Not able to fetch Functional Tests.');
}
res.send(functionaltestlist);
return;
});

}else if (req.params.id === '23') {
// For Jira
logger.debug("Entering getJira");
masterUtil.getJira(orgList, function(err, jiraList) {
if (err) {
res.status(500).send('Not able to fetch Jira.');
}
res.send(jiraList);
return;
});

} else if (req.params.id === '6') {
// For User Role
masterUtil.getUserRoles(function (err, userRoleList) {
if (err) {
Expand Down Expand Up @@ -966,7 +1007,47 @@ module.exports.setRoutes = function (app, sessionVerification) {
return;
});

} else if (req.params.id === '6') {
} else if (req.params.id === '27') {
// For Bitbucket
masterUtil.getBitbucket(orgList, function(err, bitbucketList) {
if (err) {
res.status(500).send('Not able to fetch bitbucket.');
}
res.send(bitbucketList);
return;
});

}else if (req.params.id === '28') {
// For Octopus
masterUtil.getOctopus(orgList, function(err, octopusList) {
if (err) {
res.status(500).send('Not able to fetch Octopus.');
}
res.send(octopusList);
return;
});

}else if (req.params.id === '29') {
// For QA Portal
masterUtil.getFunctionalTest(orgList, function(err, functionaltestlist) {
if (err) {
res.status(500).send('Not able to fetch Functional Tests.');
}
res.send(functionaltestlist);
return;
});

}else if (req.params.id === '23') {
// For Jira
masterUtil.getJira(orgList, function(err, jiraList) {
if (err) {
res.status(500).send('Not able to fetch Jira.');
}
res.send(jiraList);
return;
});

}else if (req.params.id === '6') {
// For User Role
masterUtil.getUserRoles(function (err, userRoleList) {
if (err) {
Expand Down