From be7b60f1f0734f16b08b94e646561fa1ad243555 Mon Sep 17 00:00:00 2001
From: isaaguilar <isa@aguilarstory.com>
Date: Thu, 7 Sep 2023 10:56:15 -0400
Subject: [PATCH] include in-cluster generation on task logs

---
 pkg/api/log.go           | 18 ++++++++++--------
 pkg/common/models/tfo.go | 13 +++++++------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/pkg/api/log.go b/pkg/api/log.go
index 420c57f..046b8c4 100644
--- a/pkg/api/log.go
+++ b/pkg/api/log.go
@@ -23,9 +23,10 @@ func (h APIHandler) AddTaskPod(c *gin.Context) {
 	generation := claims["generation"]
 
 	jsonData := struct {
-		RerunID  string `json:"rerun_id"`
-		TaskName string `json:"task_name"`
-		UUID     string `json:"uuid"`
+		RerunID             string `json:"rerun_id"`
+		TaskName            string `json:"task_name"`
+		UUID                string `json:"uuid"`
+		InClusterGeneration string `json:"generation"`
 
 		Content string `json:"content"`
 	}{}
@@ -47,11 +48,12 @@ func (h APIHandler) AddTaskPod(c *gin.Context) {
 	}
 
 	taskPod := models.TaskPod{
-		UUID:            jsonData.UUID,
-		TaskType:        jsonData.TaskName,
-		Generation:      generation,
-		Rerun:           rerunID,
-		TFOResourceUUID: resourceUUID,
+		UUID:                jsonData.UUID,
+		TaskType:            jsonData.TaskName,
+		Generation:          generation,
+		Rerun:               rerunID,
+		TFOResourceUUID:     resourceUUID,
+		InClusterGeneration: jsonData.InClusterGeneration,
 	}
 	result := h.DB.Where("uuid = ?", &jsonData.UUID).FirstOrCreate(&taskPod)
 	if result.Error != nil {
diff --git a/pkg/common/models/tfo.go b/pkg/common/models/tfo.go
index 5f7c33f..99482d1 100644
--- a/pkg/common/models/tfo.go
+++ b/pkg/common/models/tfo.go
@@ -47,12 +47,13 @@ type TFOResourceSpec struct {
 }
 
 type TaskPod struct {
-	UUID            string      `json:"uuid" gorm:"primaryKey"`
-	TaskType        string      `json:"task_type"`
-	Rerun           int         `json:"rerun"`
-	Generation      string      `json:"generation"`
-	TFOResource     TFOResource `json:"tfo_resource,omitempty"`
-	TFOResourceUUID string      `json:"tfo_resource_uuid"`
+	UUID                string      `json:"uuid" gorm:"primaryKey"`
+	TaskType            string      `json:"task_type"`
+	Rerun               int         `json:"rerun"`
+	Generation          string      `json:"generation"`
+	InClusterGeneration string      `json:"in_cluster_generation"`
+	TFOResource         TFOResource `json:"tfo_resource,omitempty"`
+	TFOResourceUUID     string      `json:"tfo_resource_uuid"`
 }
 
 type Approval struct {