Standard Format Code Changes
This commit is contained in:
1 parent
4ce8cde5b0
commit
37028e34ad
33 files changed
+175
-232
No files matched your search
@@ -6,7 +6,6 @@ export const ONE_MONTH = 'oneMonth'
|
||||
export const NO_TIME = 'noTime'
|
||||
export const FIXED_INTERVAL = 'fixedInterval'
|
||||
|
||||
|
||||
export const CloneModeEnum = [
|
||||
LIVE,
|
||||
BACKTEST,
|
||||
|
||||
@@ -34,13 +34,13 @@ const teamQuery = (authorization, teamId) => {
|
||||
}
|
||||
`,
|
||||
variables: {
|
||||
teamId: teamId
|
||||
}
|
||||
teamId: teamId
|
||||
}
|
||||
},
|
||||
headers: {
|
||||
authorization: authorization
|
||||
}
|
||||
})
|
||||
};
|
||||
}
|
||||
|
||||
export default teamQuery
|
||||
+4
-4
@@ -5,17 +5,17 @@ import schema from './schema'
|
||||
import mongoose from 'mongoose'
|
||||
import cors from 'cors'
|
||||
import logger from './config/logger'
|
||||
import wrongPreshared from './errors/notAllowed.json';
|
||||
import wrongPreshared from './errors/notAllowed.json'
|
||||
|
||||
const app = express()
|
||||
|
||||
app.post('/graphql', (req, res, next) => {
|
||||
if (req.headers.preshared === process.env.OPERATIONS_API_PRESHARED) {
|
||||
next();
|
||||
next()
|
||||
} else {
|
||||
res.send(wrongPreshared);
|
||||
res.send(wrongPreshared)
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
// Allow cross origing request
|
||||
app.use(cors())
|
||||
|
||||
@@ -10,8 +10,6 @@ const createClone = async (clone) => {
|
||||
try {
|
||||
logger.debug('createClone %s', clone.id)
|
||||
const client = new Client({config: config.fromKubeconfig(), version: '1.9'})
|
||||
|
||||
// Make changes to base deployment config
|
||||
deploymentManifest.metadata.name = clone.id
|
||||
|
||||
logger.debug('createClone Environment and Auth Configuration.')
|
||||
|
||||
@@ -4,31 +4,31 @@ import { Client, config } from 'kubernetes-client'
|
||||
|
||||
const getClonePodLogs = async (cloneName) => {
|
||||
try {
|
||||
logger.debug("getClonePodLogs on kubernates started.")
|
||||
logger.debug('getClonePodLogs on kubernates started.')
|
||||
const client = new Client({config: config.fromKubeconfig(), version: '1.9'})
|
||||
|
||||
let query = {
|
||||
"qs":{
|
||||
"labelSelector": "job-name="+cloneName
|
||||
'qs': {
|
||||
'labelSelector': 'job-name=' + cloneName
|
||||
}
|
||||
}
|
||||
|
||||
const pod = await client.api.v1.namespaces('default').pods.get(query)
|
||||
|
||||
let queryLogs = {
|
||||
"qs":{
|
||||
"tailLines": "20"
|
||||
'qs': {
|
||||
'tailLines': '20'
|
||||
}
|
||||
}
|
||||
const logs = await client.api.v1.namespaces('default')
|
||||
.pods(pod.body.items[0].metadata.name).log.get(queryLogs)
|
||||
let logsArray = logs.body.split('\n')
|
||||
|
||||
logger.debug("getClonePodLogs on kubernates successful.")
|
||||
logger.debug('getClonePodLogs on kubernates successful.')
|
||||
|
||||
return JSON.stringify(logsArray, null, 2)
|
||||
} catch (err) {
|
||||
throw new KubernateError(err)
|
||||
throw new KubernateError(err)
|
||||
}
|
||||
}
|
||||
export default getClonePodLogs
|
||||
@@ -4,12 +4,12 @@ import { Client, config } from 'kubernetes-client'
|
||||
|
||||
const getClonePodStatus = async (cloneName) => {
|
||||
try {
|
||||
logger.debug("getClonePodStatus on kubernates started. ")
|
||||
logger.debug('getClonePodStatus on kubernates started. ')
|
||||
const client = new Client({config: config.fromKubeconfig(), version: '1.9'})
|
||||
|
||||
let query = {
|
||||
"qs":{
|
||||
"labelSelector": "job-name="+cloneName
|
||||
'qs': {
|
||||
'labelSelector': 'job-name=' + cloneName
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,10 +21,10 @@ const getClonePodStatus = async (cloneName) => {
|
||||
&& clonePodStatus.terminated.hasOwnProperty('containerID')) {
|
||||
delete clonePodStatus.terminated.containerID
|
||||
}
|
||||
logger.debug("getClonePodStatus %s on kubernates successful", cloneName)
|
||||
logger.debug('getClonePodStatus %s on kubernates successful', cloneName)
|
||||
return JSON.stringify(clonePodStatus, null, 2)
|
||||
} catch (err) {
|
||||
throw new KubernateError(err)
|
||||
throw new KubernateError(err)
|
||||
}
|
||||
}
|
||||
export default getClonePodStatus
|
||||
+12
-12
@@ -2,32 +2,32 @@ import mongoose, { Schema } from 'mongoose'
|
||||
|
||||
import {
|
||||
UNPUBLISHED,
|
||||
CloneStateEnum,
|
||||
} from '../enums/CloneState';
|
||||
CloneStateEnum
|
||||
} from '../enums/CloneState'
|
||||
|
||||
import {
|
||||
BACKTEST,
|
||||
CloneModeEnum,
|
||||
} from '../enums/CloneMode';
|
||||
CloneModeEnum
|
||||
} from '../enums/CloneMode'
|
||||
|
||||
const cloneSchema = new Schema({
|
||||
authId: {
|
||||
type: String,
|
||||
required: true,
|
||||
required: true
|
||||
},
|
||||
teamId: {
|
||||
type: String,
|
||||
required: true,
|
||||
type: String,
|
||||
required: true
|
||||
},
|
||||
botId: {
|
||||
type: String,
|
||||
required: true,
|
||||
type: String,
|
||||
required: true
|
||||
},
|
||||
keyId: String,
|
||||
mode: {
|
||||
type: String,
|
||||
enum: CloneModeEnum,
|
||||
default: BACKTEST,
|
||||
default: BACKTEST
|
||||
},
|
||||
resumeExecution: Boolean,
|
||||
beginDatetime: Number,
|
||||
@@ -36,7 +36,7 @@ const cloneSchema = new Schema({
|
||||
state: {
|
||||
type: String,
|
||||
enum: CloneStateEnum,
|
||||
default: UNPUBLISHED,
|
||||
default: UNPUBLISHED
|
||||
},
|
||||
stateDatetime: Number,
|
||||
createDatetime: Number,
|
||||
@@ -52,7 +52,7 @@ const cloneSchema = new Schema({
|
||||
assetB: String,
|
||||
processName: {
|
||||
type: String,
|
||||
required: true,
|
||||
required: true
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@ import { AutorizationError } from '../errors'
|
||||
const cloneDetails = (authId, team, clone) => {
|
||||
logger.debug('cloneDetails -> Entering function.')
|
||||
|
||||
if(!(authId === (process.env.AUTH_CLIENT_ID + '@clients') || isAuthorized(team, authId))){
|
||||
logger.debug('User %s is not authorized to manage team %s.', authId, team.slug )
|
||||
if (!(authId === (process.env.AUTH_CLIENT_ID + '@clients') || isAuthorized(team, authId))) {
|
||||
logger.debug('User %s is not authorized to manage team %s.', authId, team.slug)
|
||||
throw new AutorizationError()
|
||||
}
|
||||
|
||||
@@ -20,29 +20,29 @@ const cloneDetails = (authId, team, clone) => {
|
||||
clone.botName = selectedBot.name
|
||||
clone.botAvatar = selectedBot.avatar
|
||||
clone.teamAvatar = team.profile.avatar
|
||||
clone.userLoggedIn = team.members[0].member.alias //TODO change by context info if possible
|
||||
clone.userLoggedIn = team.members[0].member.alias // TODO change by context info if possible
|
||||
|
||||
logger.debug('cloneDetails -> Retrieving clone details complete.')
|
||||
return clone
|
||||
};
|
||||
}
|
||||
|
||||
function getSelectedBot(team, selectedBotId){
|
||||
function getSelectedBot (team, selectedBotId) {
|
||||
logger.debug('cloneDetails -> Getting selected bot.')
|
||||
if(isDefined(team)){
|
||||
if (isDefined(team)) {
|
||||
for (var i = 0; i < team.fb.length; i++) {
|
||||
if(team.fb[i].id === selectedBotId){
|
||||
if (team.fb[i].id === selectedBotId) {
|
||||
return team.fb[i]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function isAuthorized(team, authId){
|
||||
function isAuthorized (team, authId) {
|
||||
logger.debug('cloneDetails -> Checking if the user is authorized by the teams module.')
|
||||
let authorized = false
|
||||
if(isDefined(team)){
|
||||
if (isDefined(team)) {
|
||||
for (var i = 0; i < team.members.length; i++) {
|
||||
if(team.members[i].member.authId === authId){
|
||||
if (team.members[i].member.authId === authId) {
|
||||
authorized = true
|
||||
break
|
||||
}
|
||||
|
||||
@@ -1,7 +1,4 @@
|
||||
import {
|
||||
GraphQLSchema
|
||||
} from 'graphql'
|
||||
|
||||
import { GraphQLSchema } from 'graphql'
|
||||
import Mutation from './mutations'
|
||||
import RootQuery from './queries'
|
||||
|
||||
|
||||
@@ -6,14 +6,12 @@ import { BotTypesEnum } from '../../enums/BotTypes'
|
||||
import teamQuery from '../../graphQLCalls/teamQuery'
|
||||
import authorizeClone from '../../graphQLCalls/authorizeClone'
|
||||
import cloneDetails from '../cloneDetails'
|
||||
|
||||
import {
|
||||
AuthentificationError,
|
||||
WrongArgumentsError,
|
||||
OperationsError,
|
||||
AutorizationError
|
||||
} from '../../errors'
|
||||
|
||||
import logger from '../../config/logger'
|
||||
import createKubernetesClone from '../../kubernetes/createClone'
|
||||
import { isDefined } from '../../config/utils'
|
||||
|
||||
@@ -1,14 +1,5 @@
|
||||
import {
|
||||
GraphQLNonNull,
|
||||
GraphQLID,
|
||||
GraphQLString
|
||||
} from 'graphql'
|
||||
|
||||
import {
|
||||
AuthentificationError,
|
||||
OperationsError
|
||||
} from '../../errors'
|
||||
|
||||
import { GraphQLNonNull, GraphQLID, GraphQLString } from 'graphql'
|
||||
import { AuthentificationError, OperationsError } from '../../errors'
|
||||
import { Clone } from '../../models'
|
||||
import logger from '../../config/logger'
|
||||
import removeKuberneteClone from '../../kubernetes/removeClone'
|
||||
@@ -33,7 +24,7 @@ const resolve = async (parent, { id }, context) => {
|
||||
active: true
|
||||
})
|
||||
|
||||
if(!isDefined(clone)){
|
||||
if (!isDefined(clone)) {
|
||||
throw new OperationsError('You are not authorized to remove this clone.')
|
||||
}
|
||||
|
||||
@@ -54,12 +45,12 @@ const resolve = async (parent, { id }, context) => {
|
||||
const update = { active: false }
|
||||
|
||||
Clone.findOneAndUpdate(query, update, options, (err, doc) => {
|
||||
if (err){
|
||||
if (err) {
|
||||
logger.error('removeClone -> Error removing clone from the DB. %s', err.stack)
|
||||
throw new OperationsError(err)
|
||||
}else{
|
||||
} else {
|
||||
logger.debug('removeClone -> Clone Removed from the DB.')
|
||||
return('Clone Removed.')
|
||||
return ('Clone Removed.')
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -5,9 +5,7 @@ import {
|
||||
GraphQLInt,
|
||||
GraphQLFloat
|
||||
} from 'graphql'
|
||||
import {
|
||||
OperationsError
|
||||
} from '../../errors'
|
||||
import { OperationsError } from '../../errors'
|
||||
import { Clone } from '../../models'
|
||||
import logger from '../../config/logger'
|
||||
import teamQuery from '../../graphQLCalls/teamQuery'
|
||||
|
||||
@@ -1,7 +1,4 @@
|
||||
import {
|
||||
GraphQLObjectType
|
||||
} from 'graphql'
|
||||
|
||||
import { GraphQLObjectType } from 'graphql'
|
||||
import AddCloneMutation from './AddCloneMutation'
|
||||
import RemoveCloneMutation from './RemoveCloneMutation'
|
||||
import UpdateExecutionSummary from './UpdateExecutionSummary'
|
||||
|
||||
@@ -1,12 +1,5 @@
|
||||
import {
|
||||
GraphQLList,
|
||||
GraphQLID
|
||||
} from 'graphql'
|
||||
|
||||
import {
|
||||
OperationsError
|
||||
} from '../../errors'
|
||||
|
||||
import { GraphQLList, GraphQLID } from 'graphql'
|
||||
import { OperationsError } from '../../errors'
|
||||
import { GetClonesType } from '../types'
|
||||
import { Clone } from '../../models'
|
||||
import logger from '../../config/logger'
|
||||
@@ -19,38 +12,37 @@ const args = {
|
||||
|
||||
const resolve = async(parent, { cloneIdList }, context) => {
|
||||
logger.debug('Get Clones -> Entering Fuction.')
|
||||
try{
|
||||
let clones = []
|
||||
for (var i = 0; i < cloneIdList.length; i++) {
|
||||
try {
|
||||
let clones = []
|
||||
for (var i = 0; i < cloneIdList.length; i++) {
|
||||
if (mongoose.Types.ObjectId.isValid(cloneIdList[i])) {
|
||||
let existingClone = await Clone.findOne({
|
||||
_id: cloneIdList[i]
|
||||
})
|
||||
|
||||
if(mongoose.Types.ObjectId.isValid(cloneIdList[i])){
|
||||
let existingClone = await Clone.findOne({
|
||||
_id: cloneIdList[i]
|
||||
})
|
||||
if (isDefined(existingClone)) {
|
||||
clones.push({
|
||||
id: cloneIdList[i],
|
||||
teamId: existingClone.teamId,
|
||||
botId: existingClone.botId
|
||||
})
|
||||
} else {
|
||||
clones.push({
|
||||
id: cloneIdList[i]
|
||||
})
|
||||
}
|
||||
} else {
|
||||
clones.push({
|
||||
id: cloneIdList[i]
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
if(isDefined(existingClone)){
|
||||
clones.push({
|
||||
id: cloneIdList[i],
|
||||
teamId: existingClone.teamId,
|
||||
botId: existingClone.botId
|
||||
})
|
||||
}else{
|
||||
clones.push({
|
||||
id: cloneIdList[i]
|
||||
})
|
||||
}
|
||||
} else {
|
||||
clones.push({
|
||||
id: cloneIdList[i]
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
return clones
|
||||
} catch (err){
|
||||
return clones
|
||||
} catch (err) {
|
||||
logger.error('Get Clones error: %s', err.stack)
|
||||
throw new OperationsError('There has been an error getting the clones.')
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const GetClones = {
|
||||
|
||||
@@ -1,12 +1,5 @@
|
||||
import {
|
||||
GraphQLList
|
||||
} from 'graphql'
|
||||
|
||||
import {
|
||||
AuthentificationError,
|
||||
OperationsError
|
||||
} from '../../errors'
|
||||
|
||||
import { GraphQLList } from 'graphql'
|
||||
import { AuthentificationError, OperationsError } from '../../errors'
|
||||
import { CloneType } from '../types'
|
||||
import { Clone } from '../../models'
|
||||
import logger from '../../config/logger'
|
||||
@@ -17,27 +10,27 @@ const args = {}
|
||||
|
||||
const resolve = async(parent, args, context) => {
|
||||
logger.debug('Retrieving History Clones.')
|
||||
try{
|
||||
if (!context.userId) {
|
||||
throw new AuthentificationError()
|
||||
}
|
||||
try {
|
||||
if (!context.userId) {
|
||||
throw new AuthentificationError()
|
||||
}
|
||||
|
||||
let clones = await Clone.find({
|
||||
authId: context.userId,
|
||||
active: false
|
||||
}).sort({createDatetime: -1})
|
||||
let clones = await Clone.find({
|
||||
authId: context.userId,
|
||||
active: false
|
||||
}).sort({createDatetime: -1})
|
||||
|
||||
for (var i = 0; i < clones.length; i++) {
|
||||
for (var i = 0; i < clones.length; i++) {
|
||||
let team = await teamQuery(context.authorization, clones[i].teamId)
|
||||
clones[i] = await cloneDetails(context.userId, team.data.data.teams_TeamById, clones[i])
|
||||
clones[i].botType = clones[i].kind // Only for listing we show the teams value
|
||||
}
|
||||
}
|
||||
|
||||
return clones
|
||||
} catch (err){
|
||||
logger.error('Retrieving History Clones error: %s', err.stack)
|
||||
throw new OperationsError('There has been an error retrieving history clones.')
|
||||
}
|
||||
return clones
|
||||
} catch (err) {
|
||||
logger.error('Retrieving History Clones error: %s', err.stack)
|
||||
throw new OperationsError('There has been an error retrieving history clones.')
|
||||
}
|
||||
}
|
||||
|
||||
const HistoryClones = {
|
||||
|
||||
@@ -1,12 +1,5 @@
|
||||
import {
|
||||
GraphQLList
|
||||
} from 'graphql'
|
||||
|
||||
import {
|
||||
AuthentificationError,
|
||||
OperationsError
|
||||
} from '../../errors'
|
||||
|
||||
import { GraphQLList } from 'graphql'
|
||||
import { AuthentificationError, OperationsError } from '../../errors'
|
||||
import { CloneType } from '../types'
|
||||
import { Clone } from '../../models'
|
||||
import logger from '../../config/logger'
|
||||
@@ -19,30 +12,30 @@ const args = {}
|
||||
|
||||
const resolve = async(parent, args, context) => {
|
||||
logger.debug('List Clones -> Entering Fuction.')
|
||||
try{
|
||||
if (!context.userId) {
|
||||
throw new AuthentificationError()
|
||||
}
|
||||
try {
|
||||
if (!context.userId) {
|
||||
throw new AuthentificationError()
|
||||
}
|
||||
|
||||
let clones = await Clone.find({
|
||||
authId: context.userId,
|
||||
active: true
|
||||
}).sort({createDatetime: -1})
|
||||
let clones = await Clone.find({
|
||||
authId: context.userId,
|
||||
active: true
|
||||
}).sort({createDatetime: -1})
|
||||
|
||||
for (var i = 0; i < clones.length; i++) {
|
||||
for (var i = 0; i < clones.length; i++) {
|
||||
let team = await teamQuery(context.authorization, clones[i].teamId)
|
||||
clones[i] = await cloneDetails(context.userId, team.data.data.teams_TeamById, clones[i])
|
||||
let state = await getCloneStatus(clones[i].id)
|
||||
clones[i].state = state.substring(1, state.length-1)
|
||||
clones[i].state = state.substring(1, state.length - 1)
|
||||
let lastLogs = await getCloneLogs(clones[i].id)
|
||||
clones[i].lastLogs = lastLogs.substring(1, lastLogs.length-1)
|
||||
clones[i].lastLogs = lastLogs.substring(1, lastLogs.length - 1)
|
||||
clones[i].botType = clones[i].kind // Only for listing we show the teams value
|
||||
}
|
||||
return clones
|
||||
} catch (err){
|
||||
}
|
||||
return clones
|
||||
} catch (err) {
|
||||
logger.error('List Clones error: %s', err.stack)
|
||||
throw new OperationsError('There has been an error listing the clones.')
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const ListClones = {
|
||||
|
||||
@@ -1,7 +1,4 @@
|
||||
import {
|
||||
GraphQLObjectType
|
||||
} from 'graphql'
|
||||
|
||||
import { GraphQLObjectType } from 'graphql'
|
||||
import ListClones from './ListClones'
|
||||
import HistoryClones from './HistoryClones'
|
||||
import GetClones from './GetClones'
|
||||
|
||||
@@ -1,7 +1,4 @@
|
||||
import {
|
||||
GraphQLObjectType,
|
||||
GraphQLID
|
||||
} from 'graphql'
|
||||
import { GraphQLObjectType, GraphQLID } from 'graphql'
|
||||
|
||||
const GetClonesType = new GraphQLObjectType({
|
||||
name: 'GetClones',
|
||||
|
||||
@@ -4,7 +4,7 @@ import {
|
||||
GraphQLInputObjectType,
|
||||
GraphQLBoolean,
|
||||
GraphQLNonNull
|
||||
} from 'graphql';
|
||||
} from 'graphql'
|
||||
|
||||
const Type = new GraphQLInputObjectType({
|
||||
name: 'CloneInput',
|
||||
@@ -25,7 +25,7 @@ const Type = new GraphQLInputObjectType({
|
||||
processName: { type: new GraphQLNonNull(GraphQLString) },
|
||||
botType: { type: new GraphQLNonNull(GraphQLString) },
|
||||
keyId: { type: GraphQLString }
|
||||
})
|
||||
});
|
||||
})
|
||||
})
|
||||
|
||||
export default Type;
|
||||
export default Type
|
||||
@@ -2,4 +2,4 @@ import CloneInputType from './Clone'
|
||||
|
||||
export {
|
||||
CloneInputType
|
||||
};
|
||||
}
|
||||
Reference in new issue
Block a user