fix: exception response

Author: FemiNoviaLina

modules/dagger/driver.go

@@ -107,20 +107,20 @@ type driverConf struct {
 }
 
 type Output struct {
-	JMDeployStatus string       `json:"jm_deploy_status,omitempty"`
-	JobStatus      string       `json:"job_status,omitempty"`
-	State          string       `json:"state,omitempty"`
-	Reconcilation  string       `json:"reconcilation,omitempty"`
-	Pods           []kube.Pod   `json:"pods,omitempty"`
-	Namespace      string       `json:"namespace,omitempty"`
-	JobID          string       `json:"job_id,omitempty"`
-	Error          string       `json:"error,omitempty"`
-	Exceptions     []Exceptions `json:"exception,omitempty"`
+	JMDeployStatus string     `json:"jm_deploy_status,omitempty"`
+	JobStatus      string     `json:"job_status,omitempty"`
+	State          string     `json:"state,omitempty"`
+	Reconcilation  string     `json:"reconcilation,omitempty"`
+	Pods           []kube.Pod `json:"pods,omitempty"`
+	Namespace      string     `json:"namespace,omitempty"`
+	JobID          string     `json:"job_id,omitempty"`
+	Error          string     `json:"error,omitempty"`
+	Exceptions     Exception  `json:"exception,omitempty"`
 }
 
-type Exceptions struct {
-	JobID         string `json:"job_id,omitempty"`
-	RootException string `json:"root_exception,omitempty"`
+type Exception struct {
+	RootException string     `json:"root_exception,omitempty"`
+	Timestamp     *time.Time `json:"timestamp,omitzero"`
 }
 
 type transientData struct {

modules/dagger/driver_output.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"time"
 
 	"github.com/goto/entropy/core/module"
 	"github.com/goto/entropy/core/resource"
@@ -32,6 +33,7 @@ type Job struct {
 
 type JobsExceptionResponse struct {
 	RootException string `json:"root-exception"`
+	Timestamp     int64  `json:"timestamp"`
 }
 
 func (dd *daggerDriver) Output(ctx context.Context, exr module.ExpandedResource) (json.RawMessage, error) {
@@ -86,11 +88,15 @@ func (dd *daggerDriver) refreshOutput(ctx context.Context, r resource.Resource,
 	output.State = state
 	output.Error = ""
 
-	jobs, err := dd.getFlinkExceptions(ctx, kubeOut.Configs, rc.Namespace, rc.Name)
+	exc, err := dd.getFlinkExceptions(ctx, kubeOut.Configs, rc.Namespace, rc.Name)
 	if err != nil {
-		output.Exceptions = []Exceptions{}
+		output.Exceptions = Exception{
+			RootException: "Failed to fetch exceptions: " + err.Error(),
+		}
+	}
+	if exc.RootException != "" {
+		output.Exceptions = exc
 	}
-	output.Exceptions = jobs
 
 	return modules.MustJSON(output), nil
 }
@@ -109,34 +115,37 @@ func (dd *daggerDriver) getKubeResources(ctx context.Context, configs kube.Confi
 	return pods, crd, nil
 }
 
-func (dd *daggerDriver) getFlinkExceptions(ctx context.Context, configs kube.Config, namespace, name string) ([]Exceptions, error) {
+func (dd *daggerDriver) getFlinkExceptions(ctx context.Context, configs kube.Config, namespace, name string) (Exception, error) {
 	jobsResponseRaw, err := dd.kubeProxyService(ctx, configs, namespace, flinkRestScheme, name+flinkRestServiceNameSuffix, flinkRestServicePort, flinkRestListJobsPath)
 	if err != nil {
-		return nil, err
+		return Exception{}, err
 	}
 
 	var jobsOverview JobsOverviewResponse
 	if err := json.Unmarshal(jobsResponseRaw, &jobsOverview); err != nil {
-		return nil, errors.ErrInternal.WithMsgf("failed to unmarshal jobs overview response").WithCausef("%s", err.Error())
+		return Exception{}, errors.ErrInternal.WithMsgf("failed to unmarshal jobs overview response").WithCausef("%s", err.Error())
 	}
 
-	jobsExceptions := make([]Exceptions, len(jobsOverview.Jobs))
-	for _, job := range jobsOverview.Jobs {
-		exceptionPath := fmt.Sprintf(flinkRestExceptionPath, job.JobID)
+	var jobException Exception
+	if len(jobsOverview.Jobs) > 0 {
+		jobId := jobsOverview.Jobs[0].JobID
+		exceptionPath := fmt.Sprintf(flinkRestExceptionPath, jobId)
 		exceptionResponseRaw, err := dd.kubeProxyService(ctx, configs, namespace, flinkRestScheme, name+flinkRestServiceNameSuffix, flinkRestServicePort, exceptionPath)
 		if err != nil {
-			return nil, err
+			return Exception{}, err
+		}
+
+		var JobsExceptionResponse JobsExceptionResponse
+		if err := json.Unmarshal(exceptionResponseRaw, &JobsExceptionResponse); err != nil {
+			return Exception{}, errors.ErrInternal.WithMsgf("failed to unmarshal jobs exception response for job %s", jobId).WithCausef("%s", err.Error())
 		}
 
-		var jobException JobsExceptionResponse
-		if err := json.Unmarshal(exceptionResponseRaw, &jobException); err != nil {
-			return nil, errors.ErrInternal.WithMsgf("failed to unmarshal jobs exception response for job %s", job.JobID).WithCausef("%s", err.Error())
+		time := time.Unix(JobsExceptionResponse.Timestamp/1000, (JobsExceptionResponse.Timestamp%1000)*int64(time.Millisecond))
+		jobException = Exception{
+			RootException: JobsExceptionResponse.RootException,
+			Timestamp:     &time,
 		}
-		jobsExceptions = append(jobsExceptions, Exceptions{
-			JobID:         job.JobID,
-			RootException: jobException.RootException,
-		})
 	}
 
-	return jobsExceptions, nil
+	return jobException, nil
 }