From 9ebec4b4e4baad4280d35a4fef79e0a5cff53922 Mon Sep 17 00:00:00 2001 From: "mati108@gmail.com" <34651529+matbenitez@users.noreply.github.com> Date: Wed, 30 Jan 2019 12:49:26 -0300 Subject: [PATCH] Removing sensitive information from logs output --- server/src/kubernetes/createClone.js | 5 ++--- server/src/kubernetes/getClonePodStatus.js | 6 +++--- server/src/kubernetes/removeClone.js | 4 ++-- server/src/schema/mutations/AddCloneMutation.js | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/server/src/kubernetes/createClone.js b/server/src/kubernetes/createClone.js index 165b96db4..d71856faf 100644 --- a/server/src/kubernetes/createClone.js +++ b/server/src/kubernetes/createClone.js @@ -8,7 +8,7 @@ import { BACKTEST} from '../enums/CloneMode'; const createClone = async (clone) => { try { - logger.info("createClone %j", clone) + logger.debug("createClone %s", clone.cloneName) const client = new Client({config: config.fromKubeconfig(), version: '1.9'}) // Make changes to base deployment config @@ -127,13 +127,12 @@ const createClone = async (clone) => { }) } - logger.debug("Configuration: %j.", env) deploymentManifest.spec.template.spec.containers[0].env = env const create = await client.apis.batch.v1.namespaces('default').jobs.post( { body: deploymentManifest }) - logger.info("createClone %s on Kubernates success.", clone.cloneName) + logger.debug("createClone %s on Kubernates success.", clone.cloneName) } catch (err) { throw new KubernateError(err) } diff --git a/server/src/kubernetes/getClonePodStatus.js b/server/src/kubernetes/getClonePodStatus.js index 37293c460..e0abbea96 100644 --- a/server/src/kubernetes/getClonePodStatus.js +++ b/server/src/kubernetes/getClonePodStatus.js @@ -4,7 +4,7 @@ import { Client, config } from 'kubernetes-client' const getClonePodStatus = async (cloneName) => { try { - logger.info("getClonePodStatus on kubernates started. ") + logger.debug("getClonePodStatus on kubernates started. ") const client = new Client({config: config.fromKubeconfig(), version: '1.9'}) let query = { @@ -12,7 +12,7 @@ const getClonePodStatus = async (cloneName) => { "labelSelector": "job-name="+cloneName } } - + const pod = await client.api.v1.namespaces('default').pods.get(query) let clonePodStatus = pod.body.items[0].status.containerStatuses[0].state @@ -21,7 +21,7 @@ const getClonePodStatus = async (cloneName) => { && clonePodStatus.terminated.hasOwnProperty('containerID')) { delete clonePodStatus.terminated.containerID } - logger.info("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) diff --git a/server/src/kubernetes/removeClone.js b/server/src/kubernetes/removeClone.js index d6440626d..dc6f2e10f 100644 --- a/server/src/kubernetes/removeClone.js +++ b/server/src/kubernetes/removeClone.js @@ -4,7 +4,7 @@ import { Client, config } from 'kubernetes-client' const removeClone = async (clone) => { try { - logger.info("removeClone %s", clone.cloneName) + logger.debug("removeClone %s", clone.cloneName) const client = new Client({config: config.fromKubeconfig(), version: '1.9'}) let query = { @@ -20,7 +20,7 @@ const removeClone = async (clone) => { const podRemoved = await client.api.v1.namespaces('default') .pods(pod.body.items[0].metadata.name).delete() - logger.info("removeClone %s on kubernates succesful", clone.cloneName) + logger.debug("removeClone %s on kubernates succesful", clone.cloneName) } catch (err) { throw new KubernateError(err) } diff --git a/server/src/schema/mutations/AddCloneMutation.js b/server/src/schema/mutations/AddCloneMutation.js index 92511bf3d..d6f703ae5 100644 --- a/server/src/schema/mutations/AddCloneMutation.js +++ b/server/src/schema/mutations/AddCloneMutation.js @@ -43,7 +43,7 @@ const resolve = async(parent, { clone }, context) => { active: true }) - logger.debug('addClone -> Checking existing clone %j', existingClone) + logger.debug('addClone -> Checking existing clone.') if(existingClone.length > 0){ throw new OperationsError('You can only have one active clone by mode. Remove the' + ' existing clone of type: ' + clone.mode + ' and try again.') @@ -66,7 +66,7 @@ const resolve = async(parent, { clone }, context) => { return new Promise((resolve, reject) => { newClone.save((err) => { if (err){ - logger.debug('addClone -> Error: %j', err) + logger.error('addClone -> Error: %s', err.stack) reject('There has been an error storing the clone.') } else {