refactor: webhooks2tasks to support trigger user and source

uselagoon · Dec 27, 2023 · 0ad8722 · 0ad8722
1 parent ab1c191
commit 0ad8722
Show file tree

Hide file tree

Showing 12 changed files with 101 additions and 12 deletions.
diff --git a/services/webhooks2tasks/src/handlers/bitbucketPullRequestUpdated.ts b/services/webhooks2tasks/src/handlers/bitbucketPullRequestUpdated.ts
@@ -47,7 +47,12 @@ export async function bitbucketPullRequestUpdated(webhook: WebhookRequestData, p
     }
 
     let buildName = generateBuildId();
-
+    // try get the user from the webhook payload
+    // otherwise just use "webhook" as the trigger user
+    let triggerUser = "webhook"
+    if (body.pullrequest.author.username) {
+      triggerUser = body.pullrequest.author.username
+    }
     const data: deployData = {
       repoName: body.repository.full_name,
       repoUrl: body.repository.links.html.href,
@@ -61,7 +66,9 @@ export async function bitbucketPullRequestUpdated(webhook: WebhookRequestData, p
       baseBranchName: baseBranchName,
       baseSha: baseSha,
       branchName: `pr-${body.pullrequest.id}`,
-      buildName: buildName
+      buildName: buildName,
+      triggerUser: triggerUser,
+      triggerSource: "WEBHOOK",
     }
 
     try {

diff --git a/services/webhooks2tasks/src/handlers/bitbucketPush.ts b/services/webhooks2tasks/src/handlers/bitbucketPush.ts
@@ -42,12 +42,20 @@ export async function bitbucketPush(webhook: WebhookRequestData, project: Projec
 
     let buildName = generateBuildId();
 
+    // try get the user from the webhook payload
+    // otherwise just use "webhook" as the trigger user
+    let triggerUser = "webhook"
+    if (body.actor.username) {
+      triggerUser = body.actor.username
+    }
     const data: deployData = {
       projectName: project.name,
       type: 'branch',
       branchName: branchName,
       sha: sha,
-      buildName: buildName
+      buildName: buildName,
+      triggerUser: triggerUser,
+      triggerSource: "WEBHOOK",
     }
 
     let logMessage = `\`<${body.push.changes[0].new.links.html.href}>\``

diff --git a/services/webhooks2tasks/src/handlers/giteaPullRequestOpened.ts b/services/webhooks2tasks/src/handlers/giteaPullRequestOpened.ts
@@ -48,6 +48,12 @@ export async function giteaPullRequestOpened(webhook: WebhookRequestData, projec
 
     let buildName = generateBuildId();
 
+    // try get the user from the webhook payload
+    // otherwise just use "webhook" as the trigger user
+    let triggerUser = "webhook"
+    if (body.sender.login) {
+      triggerUser = body.sender.login
+    }
     const data: deployData = {
       repoUrl: body.repository.html_url,
       repoName: body.repository.full_name,
@@ -61,7 +67,9 @@ export async function giteaPullRequestOpened(webhook: WebhookRequestData, projec
       baseBranchName: baseBranchName,
       baseSha: baseSha,
       branchName: `pr-${body.number}`,
-      buildName: buildName
+      buildName: buildName,
+      triggerUser: triggerUser,
+      triggerSource: "WEBHOOK",
     }
 
     try {

diff --git a/services/webhooks2tasks/src/handlers/giteaPullRequestSynchronize.ts b/services/webhooks2tasks/src/handlers/giteaPullRequestSynchronize.ts
@@ -66,6 +66,12 @@ export async function giteaPullRequestSynchronize(webhook: WebhookRequestData, p
 
     let buildName = generateBuildId();
 
+    // try get the user from the webhook payload
+    // otherwise just use "webhook" as the trigger user
+    let triggerUser = "webhook"
+    if (body.sender.login) {
+      triggerUser = body.sender.login
+    }
     const data: deployData = {
       repoName: body.repository.full_name,
       repoUrl: body.repository.html_url,
@@ -79,7 +85,9 @@ export async function giteaPullRequestSynchronize(webhook: WebhookRequestData, p
       baseBranchName: baseBranchName,
       baseSha: baseSha,
       branchName: `pr-${body.number}`,
-      buildName: buildName
+      buildName: buildName,
+      triggerUser: triggerUser,
+      triggerSource: "WEBHOOK",
     }
 
     try {

diff --git a/services/webhooks2tasks/src/handlers/giteaPush.ts b/services/webhooks2tasks/src/handlers/giteaPush.ts
@@ -43,12 +43,20 @@ export async function giteaPush(webhook: WebhookRequestData, project: Project) {
 
     let buildName = generateBuildId();
 
+    // try get the user from the webhook payload
+    // otherwise just use "webhook" as the trigger user
+    let triggerUser = "webhook"
+    if (body.sender.login) {
+      triggerUser = body.sender.login
+    }
     const data: deployData = {
       projectName: project.name,
       type: 'branch',
       branchName: branchName,
       sha: sha,
-      buildName: buildName
+      buildName: buildName,
+      triggerUser: triggerUser,
+      triggerSource: "WEBHOOK",
     }
 
     let logMessage = `\`<${body.repository.html_url}/tree/${meta.branch}|${meta.branch}>\``

diff --git a/services/webhooks2tasks/src/handlers/githubPullRequestOpened.ts b/services/webhooks2tasks/src/handlers/githubPullRequestOpened.ts
@@ -48,6 +48,12 @@ export async function githubPullRequestOpened(webhook: WebhookRequestData, proje
 
     let buildName = generateBuildId();
 
+    // try get the user from the webhook payload
+    // otherwise just use "webhook" as the trigger user
+    let triggerUser = "webhook"
+    if (body.sender.login) {
+      triggerUser = body.sender.login
+    }
     const data: deployData = {
       repoUrl: body.repository.html_url,
       repoName: body.repository.full_name,
@@ -61,7 +67,9 @@ export async function githubPullRequestOpened(webhook: WebhookRequestData, proje
       baseBranchName: baseBranchName,
       baseSha: baseSha,
       branchName: `pr-${body.number}`,
-      buildName: buildName
+      buildName: buildName,
+      triggerUser: triggerUser,
+      triggerSource: "WEBHOOK",
     }
 
     try {

diff --git a/services/webhooks2tasks/src/handlers/githubPullRequestSynchronize.ts b/services/webhooks2tasks/src/handlers/githubPullRequestSynchronize.ts
@@ -66,6 +66,12 @@ export async function githubPullRequestSynchronize(webhook: WebhookRequestData,
 
     let buildName = generateBuildId();
 
+    // try get the user from the webhook payload
+    // otherwise just use "webhook" as the trigger user
+    let triggerUser = "webhook"
+    if (body.sender.login) {
+      triggerUser = body.sender.login
+    }
     const data: deployData = {
       repoName: body.repository.full_name,
       repoUrl: body.repository.html_url,
@@ -79,7 +85,9 @@ export async function githubPullRequestSynchronize(webhook: WebhookRequestData,
       baseBranchName: baseBranchName,
       baseSha: baseSha,
       branchName: `pr-${body.number}`,
-      buildName: buildName
+      buildName: buildName,
+      triggerUser: triggerUser,
+      triggerSource: "WEBHOOK",
     }
 
     try {

diff --git a/services/webhooks2tasks/src/handlers/githubPush.ts b/services/webhooks2tasks/src/handlers/githubPush.ts
@@ -42,12 +42,20 @@ export async function githubPush(webhook: WebhookRequestData, project: Project)
 
     let buildName = generateBuildId();
 
+    // try get the user from the webhook payload
+    // otherwise just use "webhook" as the trigger user
+    let triggerUser = "webhook"
+    if (body.sender.login) {
+      triggerUser = body.sender.login
+    }
     const data: deployData = {
       projectName: project.name,
       type: 'branch',
       branchName: branchName,
       sha: sha,
-      buildName: buildName
+      buildName: buildName,
+      triggerUser: triggerUser,
+      triggerSource: "WEBHOOK",
     }
 
     let logMessage = `\`<${body.repository.html_url}/tree/${meta.branch}|${meta.branch}>\``

diff --git a/services/webhooks2tasks/src/handlers/gitlabPullRequestOpened.ts b/services/webhooks2tasks/src/handlers/gitlabPullRequestOpened.ts
@@ -48,6 +48,12 @@ export async function gitlabPullRequestOpened(webhook: WebhookRequestData, proje
 
     let buildName = generateBuildId();
 
+    // try get the user from the webhook payload
+    // otherwise just use "webhook" as the trigger user
+    let triggerUser = "webhook"
+    if (body.user.username) {
+      triggerUser = body.user.username
+    }
     const data: deployData = {
       repoUrl: body.object_attributes.target.web_url,
       repoName: body.object_attributes.target.name,
@@ -61,7 +67,9 @@ export async function gitlabPullRequestOpened(webhook: WebhookRequestData, proje
       baseBranchName: baseBranchName,
       baseSha: baseSha,
       branchName: `pr-${body.object_attributes.iid}`,
-      buildName: buildName
+      buildName: buildName,
+      triggerUser: triggerUser,
+      triggerSource: "WEBHOOK",
     }
 
     try {

diff --git a/services/webhooks2tasks/src/handlers/gitlabPullRequestUpdated.ts b/services/webhooks2tasks/src/handlers/gitlabPullRequestUpdated.ts
@@ -48,6 +48,12 @@ export async function gitlabPullRequestUpdated(webhook: WebhookRequestData, proj
 
     let buildName = generateBuildId();
 
+    // try get the user from the webhook payload
+    // otherwise just use "webhook" as the trigger user
+    let triggerUser = "webhook"
+    if (body.user.username) {
+      triggerUser = body.user.username
+    }
     const data: deployData = {
       repoUrl: body.object_attributes.target.web_url,
       repoName: body.object_attributes.target.name,
@@ -61,7 +67,9 @@ export async function gitlabPullRequestUpdated(webhook: WebhookRequestData, proj
       baseBranchName: baseBranchName,
       baseSha: baseSha,
       branchName: `pr-${body.object_attributes.iid}`,
-      buildName: buildName
+      buildName: buildName,
+      triggerUser: triggerUser,
+      triggerSource: "WEBHOOK",
     }
 
     try {

diff --git a/services/webhooks2tasks/src/handlers/gitlabPush.ts b/services/webhooks2tasks/src/handlers/gitlabPush.ts
@@ -43,12 +43,20 @@ export async function gitlabPush(webhook: WebhookRequestData, project: Project)
 
     let buildName = generateBuildId();
 
+    // try get the user from the webhook payload
+    // otherwise just use "webhook" as the trigger user
+    let triggerUser = "webhook"
+    if (body.user_username) {
+      triggerUser = body.user_username
+    }
     const data: deployData = {
       projectName: project.name,
       type: 'branch',
       branchName: branchName,
       sha: sha,
-      buildName: buildName
+      buildName: buildName,
+      triggerUser: triggerUser,
+      triggerSource: "WEBHOOK",
     }
 
     let logMessage = `\`<${body.project.http_url}/tree/${meta.branch}|${meta.branch}>\``

diff --git a/services/webhooks2tasks/src/types.ts b/services/webhooks2tasks/src/types.ts
@@ -32,6 +32,8 @@ export interface deployData {
   buildPriority?: string,
   bulkId?: string,
   buildVariables?: any,
+  triggerUser?: string,
+  triggerSource?: string,
 };
 
 export interface WebhookRequestData {