diff --git a/server/src/kubernetes/createClone.js b/server/src/kubernetes/createClone.js index 6565b6368..e4db79b8e 100644 --- a/server/src/kubernetes/createClone.js +++ b/server/src/kubernetes/createClone.js @@ -131,7 +131,7 @@ const createClone = async (clone) => { const create = await client.apis.batch.v1.namespaces('default').jobs.post( { body: deploymentManifest }) - logger.debug("createClone %s on Kubernates success.", clone.cloneName) + logger.debug("createClone %s on Kubernates success.", clone.id) } catch (err) { throw new KubernateError(err) } diff --git a/server/src/kubernetes/removeClone.js b/server/src/kubernetes/removeClone.js index e6c908c10..5af470b47 100644 --- a/server/src/kubernetes/removeClone.js +++ b/server/src/kubernetes/removeClone.js @@ -14,13 +14,13 @@ const removeClone = async (clone) => { } const removed = await client.apis.batch.v1.namespaces('default').jobs( - clone.cloneName).delete() + clone.id).delete() const pod = await client.api.v1.namespaces('default').pods.get(query) const podRemoved = await client.api.v1.namespaces('default') .pods(pod.body.items[0].metadata.name).delete() - logger.debug("removeClone %s on kubernates succesful", clone.cloneName) + logger.debug("removeClone %s on kubernates succesful", clone.id) } catch (err) { throw new KubernateError(err) } diff --git a/server/src/schema/cloneDetails.js b/server/src/schema/cloneDetails.js index 08cee99be..5ac7ba13b 100644 --- a/server/src/schema/cloneDetails.js +++ b/server/src/schema/cloneDetails.js @@ -5,7 +5,7 @@ import { AutorizationError } from '../errors' const cloneDetails = async(authId, team, clone) => { logger.debug('Retrieving clone details.') - if(!(authId === process.env.AACLOUD_ID || isAuthorized(team, authId))){ + 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() } diff --git a/server/src/schema/queries/ListClones.js b/server/src/schema/queries/ListClones.js index 0d15db13e..9e80b9aec 100644 --- a/server/src/schema/queries/ListClones.js +++ b/server/src/schema/queries/ListClones.js @@ -30,7 +30,6 @@ const resolve = async(parent, args, context) => { }).sort({createDatetime: -1}) for (var i = 0; i < clones.length; i++) { - logger.debug('List Clones -> clone: %j',clones[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)