Skip to content

Commit 813a474

Browse files
committed
cancelled added
1 parent d155213 commit 813a474

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

src/common/mustacheHelper.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,14 @@ export class MustacheHelper {
9393

9494
// Handle approval events FIRST (before checking pipelineType)
9595
if (event.eventTypeId===EVENT_TYPE.Approval){
96-
let imageTagNames,imageComment,imageLink,approvalLink;
96+
let imageTagNames,imageComment,imageLink,approvalLink,approvalAction;
9797
let index = -1;
9898
if (event.payload.dockerImageUrl) index = event.payload.dockerImageUrl.lastIndexOf(":");
9999
if (event.payload.imageTagNames) imageTagNames = event.payload.imageTagNames;
100100
if (event.payload.imageComment) imageComment = event.payload.imageComment;
101101
if (baseURL && event.payload.imageApprovalLink) imageLink =`${baseURL}${event.payload.imageApprovalLink}`;
102102
if (baseURL && event.payload.approvalLink) approvalLink = `${baseURL}${event.payload.approvalLink}`;
103+
if (event.payload.approvalAction) approvalAction = event.payload.approvalAction;
103104

104105
return {
105106
eventTime: timestamp,
@@ -113,16 +114,18 @@ export class MustacheHelper {
113114
tags:imageTagNames,
114115
imageApprovalLink:imageLink,
115116
approvalLink:approvalLink,
117+
approvalAction:approvalAction,
116118
}
117119
}
118120

119121
if (event.eventTypeId===EVENT_TYPE.ConfigApproval){
120-
let protectConfigFileType,protectConfigFileName,protectConfigComment,protectConfigLink,envName,approvalLink;
122+
let protectConfigFileType,protectConfigFileName,protectConfigComment,protectConfigLink,envName,approvalLink,approvalAction;
121123
if (event.payload.protectConfigFileType) protectConfigFileType = event.payload.protectConfigFileType;
122124
if (event.payload.protectConfigFileName) protectConfigFileName = event.payload.protectConfigFileName;
123125
if (event.payload.protectConfigComment) protectConfigComment = event.payload.protectConfigComment.split("\n");
124126
if (baseURL && event.payload.protectConfigLink) protectConfigLink =`${baseURL}${event.payload.protectConfigLink}`;
125127
if (baseURL && event.payload.approvalLink) approvalLink = `${baseURL}${event.payload.approvalLink}`;
128+
if (event.payload.approvalAction) approvalAction = event.payload.approvalAction;
126129
if (!event.payload.envName){
127130
envName="Base configuration"
128131
}
@@ -140,6 +143,7 @@ export class MustacheHelper {
140143
protectConfigComment:protectConfigComment,
141144
protectConfigLink:protectConfigLink,
142145
approvalLink:approvalLink,
146+
approvalAction:approvalAction,
143147
}
144148
}
145149

src/common/types.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ export interface ParseApprovalEvent {
8888
imageLink?: string;
8989
imageTag: string;
9090
approvalLink?: string;
91+
approvalAction?: string; // "requested", "approved", or "cancelled"
9192

9293
}
9394
export interface ParseConfigApprovalEvent {
@@ -101,6 +102,7 @@ export interface ParseConfigApprovalEvent {
101102
protectConfigFileName: string;
102103
protectConfigLink?: string;
103104
approvalLink?: string;
105+
approvalAction?: string; // "requested", "approved", or "cancelled"
104106
}
105107

106108
export interface ParseDeploymentApprovedEvent {

0 commit comments

Comments
 (0)