Merge pull request #3303 from uselagoon/testing/activity_logger

uselagoon · Oct 7, 2022 · 42f754e · 42f754e
2 parents 6794ece + 89a078d
commit 42f754e
Show file tree

Hide file tree

Showing 20 changed files with 130 additions and 168 deletions.
diff --git a/services/api/src/resources/backup/resolvers.ts b/services/api/src/resources/backup/resolvers.ts
@@ -190,20 +190,18 @@ export const addBackup: ResolverFn = async (
 
   pubSub.publish(EVENTS.BACKUP.ADDED, backup);
 
-  userActivityLogger(
-    `User deployed backup '${backupId}' to '${environment.name}' on project '${environment.project}'`,
-    {
+  userActivityLogger(`User deployed backup '${backupId}' to '${environment.name}' on project '${environment.project}'`, {
+    project: '',
+    event: 'api:addBackup',
+    payload: {
+      id,
+      environment,
       project: environment.project,
-      event: 'api:addBackup',
-      payload: {
-        id,
-        environment,
-        source,
-        backupId,
-        created
-      }
+      source,
+      backupId,
+      created
     }
-  );
+  });
 
   return backup;
 };
@@ -310,18 +308,16 @@ export const addRestore: ResolverFn = async (
     project: projectData
   };
 
-  userActivityLogger(
-    `User restored a backup '${backupId}' for project ${projectData.name}`,
-    {
+  userActivityLogger(`User restored a backup '${backupId}' for project ${projectData.name}`, {
+    project: '',
+    event: 'api:addRestore',
+    payload: {
+      restoreId: restoreData.id,
       project: projectData.name,
-      event: 'api:addRestore',
-      payload: {
-        restoreId: restoreData.id,
-        backupId,
-        data
-      }
+      backupId,
+      data
     }
-  );
+  });
 
   try {
     await createMiscTask({ key: 'restic:backup:restore', data });

diff --git a/services/api/src/resources/deployment/resolvers.ts b/services/api/src/resources/deployment/resolvers.ts
@@ -483,17 +483,14 @@ export const cancelDeployment: ResolverFn = async (
     project
   };
 
-  userActivityLogger(
-    `User cancelled deployment for '${deployment.environment}'`,
-    {
-      project: '',
-      event: 'api:cancelDeployment',
-      payload: {
-        deploymentInput,
-        data: data.build
-      }
+  userActivityLogger(`User cancelled deployment for '${deployment.environment}'`, {
+    project: '',
+    event: 'api:cancelDeployment',
+    payload: {
+      deploymentInput,
+      data: data.build
     }
-  );
+  });
 
   try {
     await createMiscTask({ key: 'build:cancel', data });
@@ -654,16 +651,13 @@ export const deployEnvironmentLatest: ResolverFn = async (
       return `Error: Unknown deploy type ${environment.deployType}`;
   }
 
-  userActivityLogger(
-    `User triggered a deployment on '${deployData.projectName}' for '${environment.name}'`,
-    {
-      project: deployData.projectName || '',
-      event: 'api:deployEnvironmentLatest',
-      payload: {
-        deployData
-      }
+  userActivityLogger(`User triggered a deployment on '${deployData.projectName}' for '${environment.name}'`, {
+    project: '',
+    event: 'api:deployEnvironmentLatest',
+    payload: {
+      deployData
     }
-  );
+  });
 
   try {
     await taskFunction(deployData);
@@ -756,16 +750,13 @@ export const deployEnvironmentBranch: ResolverFn = async (
     branchName: deployData.branchName
   };
 
-  userActivityLogger(
-    `User triggered a deployment on '${deployData.projectName}' for '${deployData.branchName}'`,
-    {
-      project: deployData.projectName || '',
-      event: 'api:deployEnvironmentBranch',
-      payload: {
-        deployData
-      }
+  userActivityLogger(`User triggered a deployment on '${deployData.projectName}' for '${deployData.branchName}'`, {
+    project: '',
+    event: 'api:deployEnvironmentBranch',
+    payload: {
+      deployData
     }
-  );
+  });
 
   try {
     await createDeployTask(deployData);
@@ -869,16 +860,13 @@ export const deployEnvironmentPullrequest: ResolverFn = async (
     pullrequestTitle: deployData.pullrequestTitle
   };
 
-  userActivityLogger(
-    `User triggered a pull-request deployment on '${deployData.projectName}' for '${deployData.branchName}'`,
-    {
-      project: deployData.projectName || '',
-      event: 'api:deployEnvironmentPullrequest',
-      payload: {
-        deployData
-      }
+  userActivityLogger(`User triggered a pull-request deployment on '${deployData.projectName}' for '${deployData.branchName}'`, {
+    project: '',
+    event: 'api:deployEnvironmentPullrequest',
+    payload: {
+      deployData
     }
-  );
+  });
 
   try {
     await createDeployTask(deployData);
@@ -993,16 +981,14 @@ export const deployEnvironmentPromote: ResolverFn = async (
     promoteSourceEnvironment: deployData.promoteSourceEnvironment
   };
 
-  userActivityLogger(
-    `User promoted the environment on '${deployData.projectName}' from '${deployData.promoteSourceEnvironment}' to '${deployData.branchName}'`,
-    {
-      project: deployData.projectName || '',
-      event: 'api:deployEnvironmentPromote',
-      payload: {
-        deployData
-      }
+  userActivityLogger(`User promoted the environment on '${deployData.projectName}'
+    from '${deployData.promoteSourceEnvironment}' to '${deployData.branchName}'`, {
+    project: '',
+    event: 'api:deployEnvironmentPromote',
+    payload: {
+      deployData
     }
-  );
+  });
 
   try {
     await createPromoteTask(deployData);

diff --git a/services/api/src/resources/deploytargetconfig/resolvers.ts b/services/api/src/resources/deploytargetconfig/resolvers.ts
@@ -152,7 +152,7 @@ export const updateEnvironmentDeployTarget: ResolverFn = async (
   ).getProjectByEnvironmentId(environment);
 
   userActivityLogger(`User changed DeployTarget for environment`, {
-    project: projectObj.name,
+    project: '',
     event: 'api:updateEnvironmentDeployTarget',
     payload: {
       ...input
@@ -212,7 +212,7 @@ export const addDeployTargetConfig: ResolverFn = async (
   const rows = await query(sqlClientPool, Sql.selectDeployTargetConfigById(insertId));
 
   userActivityLogger(`User added DeployTargetConfig`, {
-    project: input.name || '',
+    project: '',
     event: 'api:addDeployTargetConfig',
     payload: {
       ...input
@@ -248,8 +248,8 @@ export const deleteDeployTargetConfig: ResolverFn = async (
   }
 
   userActivityLogger(`User deleted DeployTargetConfig'`, {
-    project: project || '',
-    event: 'api:deleteEnvironment',
+    project: '',
+    event: 'api:deleteDeployTargetConfig',
     payload: {
       id,
       project,

diff --git a/services/api/src/resources/env-variables/resolvers.ts b/services/api/src/resources/env-variables/resolvers.ts
@@ -91,13 +91,12 @@ const addEnvVariableToProject = async (
 
   const rows = await query(sqlClientPool, Sql.selectEnvVariable(insertId));
 
-  userActivityLogger(`User added environment variable to project '${typeId}'`, {
+  userActivityLogger(`User added environment variable '${name}' with scope '${scope}' to project '${typeId}'`, {
     project: '',
     event: 'api:addEnvVariableToProject',
     payload: {
       id,
       name,
-      value,
       scope,
       typeId
     }
@@ -136,13 +135,12 @@ const addEnvVariableToEnvironment = async (
 
   const rows = await query(sqlClientPool, Sql.selectEnvVariable(insertId));
 
-  userActivityLogger(`User added environment variable to environment '${environment.name}' on '${environment.project}'`, {
+  userActivityLogger(`User added environment variable '${name}' with scope '${scope}' to environment '${environment.name}' on '${environment.project}'`, {
     project: '',
     event: 'api:addEnvVariableToEnvironment',
     payload: {
       id,
       name,
-      value,
       scope,
       typeId,
       environment

diff --git a/services/api/src/resources/environment/resolvers.ts b/services/api/src/resources/environment/resolvers.ts
@@ -392,7 +392,7 @@ export const addOrUpdateEnvironment: ResolverFn = async (
   const rows = await query(sqlClientPool, Sql.selectEnvironmentById(insertId));
 
   userActivityLogger(`User updated environment`, {
-    project: projectOpenshift.name || '',
+    project: '',
     event: 'api:addOrUpdateEnvironment',
     payload: {
       ...input
@@ -445,7 +445,7 @@ export const addOrUpdateEnvironmentStorage: ResolverFn = async (
   const { name: projectName } = await projectHelpers(sqlClientPool).getProjectByEnvironmentId(environment['environment']);
 
   userActivityLogger(`User updated environment storage on project '${projectName}'`, {
-    project: projectName || '',
+    project: '',
     event: 'api:addOrUpdateEnvironmentStorage',
     payload: {
       projectName,
@@ -557,7 +557,7 @@ export const deleteEnvironment: ResolverFn = async (
   }
 
   userActivityLogger(`User deleted environment '${environment.name}' on project '${projectName}'`, {
-    project: data.projectName || '',
+    project: '',
     event: 'api:deleteEnvironment',
     payload: {
       projectName,
@@ -634,7 +634,7 @@ export const updateEnvironment: ResolverFn = async (
   const withK8s = Helpers(sqlClientPool).aliasOpenshiftToK8s(rows);
 
   userActivityLogger(`User updated environment '${curEnv.name}' on project '${curEnv.project}'`, {
-    project: curEnv.project || '',
+    project: '',
     event: 'api:updateEnvironment',
     payload: {
       openshiftProjectName,

diff --git a/services/api/src/resources/file/resolvers.ts b/services/api/src/resources/file/resolvers.ts
@@ -67,8 +67,8 @@ export const uploadFilesForTask: ResolverFn = async (
 
   const rows = await query(sqlClientPool, taskSql.selectTask(task));
 
-  userActivityLogger(
-    `User uploaded files for task '${task}' on project '${R.path(
+  userActivityLogger(`User uploaded files for task '${task}' on project
+      '${R.path(
       ['0', 'pid'],
       rowsPerms
     )}'`,

diff --git a/services/api/src/resources/group/resolvers.ts b/services/api/src/resources/group/resolvers.ts
@@ -431,7 +431,7 @@ export const addGroupsToProject: ResolverFn = async (
   }
 
   userActivityLogger(`User synced groups to a project`, {
-    project: project.name || '',
+    project: '',
     event: 'api:addGroupsToProject',
     payload: {
       input: {

diff --git a/services/api/src/resources/notification/resolvers.ts b/services/api/src/resources/notification/resolvers.ts
@@ -108,7 +108,7 @@ export const addNotificationToProject: ResolverFn = async (
 
 
   userActivityLogger(`User added a notification to project '${pid}'`, {
-    project: input.project || '',
+    project: '',
     event: 'api:addNotificationToProject',
     payload: {
      projectNotification

diff --git a/services/api/src/resources/problem/resolvers.ts b/services/api/src/resources/problem/resolvers.ts
@@ -303,7 +303,7 @@ export const addProblemHarborScanMatch: ResolverFn = async (
   );
 
   userActivityLogger(`User added harbor scan regex matcher`, {
-    project: defaultLagoonProject || '',
+    project: '',
     event: 'api:addProblemHarborScanMatch',
     payload: {
       input: {

diff --git a/services/api/src/resources/project/resolvers.ts b/services/api/src/resources/project/resolvers.ts
@@ -424,7 +424,7 @@ export const addProject = async (
   }
 
   userActivityLogger(`User added a project '${project.name}'`, {
-    project: project.name,
+    project: '',
     event: 'api:addProject',
     payload: {
       input,
@@ -496,7 +496,7 @@ export const deleteProject: ResolverFn = async (
   // }
 
   userActivityLogger(`User deleted a project '${project.name}'`, {
-    project: project.name,
+    project: '',
     event: 'api:deleteProject',
     payload: {
       input: {
@@ -714,9 +714,10 @@ export const updateProject: ResolverFn = async (
   // }
 
   userActivityLogger(`User updated project '${oldProject.name}'`, {
-    project: oldProject.name,
+    project: '',
     event: 'api:updateProject',
     payload: {
+      project: oldProject.name,
       patch: {
         name,
         gitUrl,