Merge pull request #123 from vbihun/earlier-return-in-event-handler

Earlier return in event handler
atlassian-labs · Sep 23, 2024 · 30ef367 · 30ef367
2 parents f4b625e + 44fa2b7
commit 30ef367
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/src/entry/webtriggers/process-gitlab-event.test.ts b/src/entry/webtriggers/process-gitlab-event.test.ts
@@ -64,7 +64,7 @@ describe('processGitlabEvent', () => {
     await processGitlabEvent(webtriggerRequest);
 
     expect(mockHandlePushEvent).toHaveBeenCalledWith(MOCK_PUSH_EVENT, TEST_TOKEN, MOCK_CLOUD_ID);
-    expect(serverResponse).toHaveBeenCalledWith('Processed webhook event');
+    expect(serverResponse).toHaveBeenCalledWith('Processed webhook event of type PUSH');
   });
 
   it('returns server response error in case of invalid webhook event secret', async () => {
@@ -102,7 +102,7 @@ describe('processGitlabEvent', () => {
     await processGitlabEvent(webtriggerRequest);
 
     expect(mockHandlePipelineEvent).toHaveBeenCalledWith(MOCK_PIPELINE_EVENT, TEST_TOKEN, MOCK_CLOUD_ID);
-    expect(serverResponse).toHaveBeenCalledWith('Processed webhook event');
+    expect(serverResponse).toHaveBeenCalledWith('Processed webhook event of type PIPELINE');
   });
 
   it('handles merge request event', async () => {
@@ -111,7 +111,7 @@ describe('processGitlabEvent', () => {
     await processGitlabEvent(webtriggerRequest);
 
     expect(mockHandleMergeRequestEvent).toHaveBeenCalledWith(MOCK_MERGE_REQUEST_EVENT, TEST_TOKEN, MOCK_CLOUD_ID);
-    expect(serverResponse).toHaveBeenCalledWith('Processed webhook event');
+    expect(serverResponse).toHaveBeenCalledWith('Processed webhook event of type MERGE_REQUEST');
   });
 
   it('handles deployment event when FF is enabled', async () => {
@@ -120,6 +120,6 @@ describe('processGitlabEvent', () => {
     await processGitlabEvent(webtriggerRequest);
 
     expect(mockDeploymentEvent).toHaveBeenCalledWith(MOCK_DEPLOYMENT_EVENT, TEST_TOKEN, MOCK_CLOUD_ID);
-    expect(serverResponse).toHaveBeenCalledWith('Processed webhook event');
+    expect(serverResponse).toHaveBeenCalledWith('Processed webhook event of type DEPLOYMENT');
   });
 });
diff --git a/src/entry/webtriggers/process-gitlab-event.ts b/src/entry/webtriggers/process-gitlab-event.ts
@@ -6,6 +6,7 @@ import {
   MergeRequestEvent,
   PipelineEvent,
   PushEvent,
+  WebhookTypes,
   WebtriggerRequest,
   WebtriggerResponse,
 } from '../../types';
@@ -47,20 +48,28 @@ export const processGitlabEvent = async (event: WebtriggerRequest): Promise<Webt
 
     const parsedEvent = parseEventPayload(eventPayload);
 
-    if (parsedEvent.object_kind === 'push') {
+    if (parsedEvent.object_kind === WebhookTypes.PUSH) {
       await handlePushEvent(parsedEvent as PushEvent, groupToken, cloudId);
+
+      return serverResponse('Processed webhook event of type PUSH');
     }
 
-    if (parsedEvent.object_kind === 'merge_request') {
+    if (parsedEvent.object_kind === WebhookTypes.MERGE_REQUEST) {
       await handleMergeRequestEvent(parsedEvent as MergeRequestEvent, groupToken, cloudId);
+
+      return serverResponse('Processed webhook event of type MERGE_REQUEST');
     }
 
-    if (parsedEvent.object_kind === 'pipeline') {
+    if (parsedEvent.object_kind === WebhookTypes.PIPELINE) {
       await handlePipelineEvent(parsedEvent as PipelineEvent, groupToken, cloudId);
+
+      return serverResponse('Processed webhook event of type PIPELINE');
     }
 
-    if (parsedEvent.object_kind === 'deployment') {
+    if (parsedEvent.object_kind === WebhookTypes.DEPLOYMENT) {
       await handleDeploymentEvent(parsedEvent as DeploymentEvent, groupToken, cloudId);
+
+      return serverResponse('Processed webhook event of type DEPLOYMENT');
     }
 
     return serverResponse('Processed webhook event');

diff --git a/src/types.ts b/src/types.ts
@@ -369,6 +369,13 @@ enum GitLabAccessLevels {
   OWNER = 50,
 }
 
+enum WebhookTypes {
+  PUSH = 'push',
+  MERGE_REQUEST = 'merge_request',
+  PIPELINE = 'pipeline',
+  DEPLOYMENT = 'deployment',
+}
+
 type Environment = {
   id: number;
   name: string;
@@ -471,4 +478,5 @@ export {
   EnvironmentTier,
   GitlabPipelineStates,
   GitLabAccessLevels,
+  WebhookTypes,
 };