From aee2875fcd6379618eb52a7f8a64315a7bb63425 Mon Sep 17 00:00:00 2001
From: Jyotsna <Josh-01@github.com>
Date: Mon, 23 Nov 2020 15:44:04 +0530
Subject: [PATCH] JSON structure fixes

---
 lib/constants.js | 3 ++-
 src/constants.ts | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/constants.js b/lib/constants.js
index 3dd2be68..1292d59b 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -26,7 +26,7 @@ exports.deploymentTypes = ['deployment', 'replicaset', 'daemonset', 'pod', 'stat
 exports.workloadTypes = ['deployment', 'replicaset', 'daemonset', 'pod', 'statefulset', 'job', 'cronjob'];
 exports.workloadTypesWithRolloutStatus = ['deployment', 'daemonset', 'statefulset'];
 function getWorkflowAnnotationsJson(lastSuccessRunSha, workflowFilePath, filePathConfigs) {
-    let annotationObject;
+    let annotationObject = {};
     annotationObject["run"] = process.env.GITHUB_RUN_ID;
     annotationObject["repository"] = process.env.GITHUB_REPOSITORY;
     annotationObject["workflow"] = process.env.GITHUB_WORKFLOW;
@@ -35,6 +35,7 @@ function getWorkflowAnnotationsJson(lastSuccessRunSha, workflowFilePath, filePat
     annotationObject["createdBy"] = process.env.GITHUB_ACTOR;
     annotationObject["runUri"] = `https://github.com/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`;
     annotationObject["commit"] = process.env.GITHUB_SHA;
+    annotationObject["lastSuccessRunCommit"] = lastSuccessRunSha;
     annotationObject["branch"] = process.env.GITHUB_REF;
     annotationObject["deployTimestamp"] = Date.now();
     annotationObject["dockerfilePaths"] = filePathConfigs.dockerfilePaths;
diff --git a/src/constants.ts b/src/constants.ts
index 6b96b36d..359c098a 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -26,7 +26,7 @@ export const workloadTypes: string[] = ['deployment', 'replicaset', 'daemonset',
 export const workloadTypesWithRolloutStatus: string[] = ['deployment', 'daemonset', 'statefulset'];
 
 export function getWorkflowAnnotationsJson(lastSuccessRunSha: string, workflowFilePath: string, filePathConfigs: any): string {
-    let annotationObject: any;
+    let annotationObject: any = {};
     annotationObject["run"] = process.env.GITHUB_RUN_ID;
     annotationObject["repository"] = process.env.GITHUB_REPOSITORY;
     annotationObject["workflow"] = process.env.GITHUB_WORKFLOW;
@@ -35,13 +35,14 @@ export function getWorkflowAnnotationsJson(lastSuccessRunSha: string, workflowFi
     annotationObject["createdBy"] = process.env.GITHUB_ACTOR;
     annotationObject["runUri"] = `https://github.com/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`;
     annotationObject["commit"] = process.env.GITHUB_SHA;
+    annotationObject["lastSuccessRunCommit"] = lastSuccessRunSha;
     annotationObject["branch"] = process.env.GITHUB_REF;
     annotationObject["deployTimestamp"] = Date.now();
     annotationObject["dockerfilePaths"] = filePathConfigs.dockerfilePaths;
     annotationObject["manifestsPaths"] = filePathConfigs.manifestFilePaths
     annotationObject["helmChartPaths"] = filePathConfigs.helmChartFilePaths;
     annotationObject["provider"] = "GitHub";
-    
+
     return JSON.stringify(annotationObject);
 }