Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/common/mustacheHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@ export class MustacheHelper {
? date.unix()
: date.format('dddd, MMMM Do YYYY hh:mm A [GMT]Z');

// For Slack, create a formatted timestamp string with the special Slack format
// Using <!date^TIMESTAMP^{date_long} {time}> format which matches CD templates
const slackTimestamp = isSlackNotification
? `<!date^${date.unix()}^{date_long} {time} | "-">`
: null;

let baseURL = event.baseUrl;

// Handle approval events FIRST (before checking pipelineType)
Expand All @@ -97,6 +103,7 @@ export class MustacheHelper {

return {
eventTime: timestamp,
slackTimestamp: slackTimestamp,
triggeredBy: event.payload.triggeredBy || "NA",
appName: event.payload.appName || "NA",
envName: event.payload.envName || "NA",
Expand Down Expand Up @@ -124,6 +131,7 @@ export class MustacheHelper {
}
return {
eventTime: timestamp,
slackTimestamp: slackTimestamp,
triggeredBy: event.payload.triggeredBy || "NA",
appName: event.payload.appName || "NA",
envName: envName,
Expand Down Expand Up @@ -179,6 +187,7 @@ export class MustacheHelper {
if (baseURL && event.payload.buildHistoryLink) buildHistoryLink = `${baseURL}${event.payload.buildHistoryLink}`;
const parsedEvent:ParsedCIEvent = {
eventTime: timestamp,
slackTimestamp: slackTimestamp,
triggeredBy: event.payload.triggeredBy || "NA",
appName: event.payload.appName || "NA",
pipelineName: event.payload.pipelineName || "NA",
Expand All @@ -200,6 +209,7 @@ export class MustacheHelper {

return {
eventTime: timestamp,
slackTimestamp: slackTimestamp,
triggeredBy: event.payload.triggeredBy || "NA",
appName: event.payload.appName || "NA",
envName: event.payload.envName || "NA",
Expand Down Expand Up @@ -229,6 +239,7 @@ export class MustacheHelper {

return {
eventTime: timestamp,
slackTimestamp: slackTimestamp,
triggeredBy: event.payload.triggeredBy || "NA",
appName: event.payload.appName || "NA",
envName: event.payload.envName || envName,
Expand Down Expand Up @@ -433,6 +444,7 @@ export class WebhookData {

interface ParseArtifactPromotionEvent {
eventTime: number | string;
slackTimestamp?: string;
triggeredBy: string;
appName: string;
envName: string;
Expand Down
4 changes: 4 additions & 0 deletions src/common/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export interface ciMaterials {
}//For Slack
export interface ParsedCIEvent {
eventTime: number | string;
slackTimestamp?: string;
triggeredBy: string;
appName: string;
pipelineName: string;
Expand Down Expand Up @@ -77,6 +78,7 @@ export interface WebhookParsedEvent {
}
export interface ParseApprovalEvent {
eventTime: number | string;
slackTimestamp?: string;
triggeredBy: string;
appName: string;
pipelineName: string;
Expand All @@ -90,6 +92,7 @@ export interface ParseApprovalEvent {
}
export interface ParseConfigApprovalEvent {
eventTime: number | string;
slackTimestamp?: string;
triggeredBy: string;
appName: string;
envName: string;
Expand All @@ -116,6 +119,7 @@ export interface ParsedScoopNotification {

export interface ParsedCDEvent {
eventTime: number | string;
slackTimestamp?: string;
triggeredBy: string;
appName: string;
pipelineName: string;
Expand Down
Loading