Merge pull request #6 from opengovern/feat-make-task

fix: add progress to task

Author: artaasadi

discovery/task/run-task.go

@@ -57,8 +57,8 @@ func NewTaskRunner(ctx context.Context, jq *jq.JobQueue, coreServiceEndpoint str
 type TaskResult struct {
 	AllIntegrations             []string                      `json:"all_integrations"`
 	AllIntegrationsCount        int                           `json:"all_integrations_count"`
-	ProgressedIntegrations      map[string]*IntegrationResult `json:"proposed_integrations"`
-	ProgressedIntegrationsCount int                           `json:"proposed_integrations_count"`
+	ProgressedIntegrations      map[string]*IntegrationResult `json:"progressed_integrations"`
+	ProgressedIntegrationsCount int                           `json:"progressed_integrations_count"`
 }
 
 type IntegrationResult struct {
@@ -105,7 +105,6 @@ func (tr *TaskRunner) RunTask(ctx context.Context) error {
 		}
 	}
 
-	taskResult.AllIntegrations = make([]string, len(integrations))
 	for _, i := range integrations {
 		taskResult.AllIntegrations = append(taskResult.AllIntegrations, i.IntegrationID)
 	}
@@ -155,12 +154,10 @@ func (tr *TaskRunner) describeIntegrationResourceTypes(ctx context.Context, i In
 		}
 	}
 
-	taskResult.ProgressedIntegrations[i.IntegrationID].AllResourceTypes = make([]string, len(resourceTypes))
 	for _, rt := range resourceTypes {
 		taskResult.ProgressedIntegrations[i.IntegrationID].AllResourceTypes = append(taskResult.ProgressedIntegrations[i.IntegrationID].AllResourceTypes, rt.Name)
 	}
 	taskResult.ProgressedIntegrations[i.IntegrationID].AllResourceTypesCount = len(resourceTypes)
-	taskResult.ProgressedIntegrations[i.IntegrationID].ResourceTypeResults = make([]ResourceTypeResult, len(resourceTypes))
 
 	for _, rt := range resourceTypes {
 		params := make(map[string]string)

discovery/worker/worker.go

@@ -184,11 +184,11 @@ func (w *Worker) ProcessMessage(ctx context.Context, msg jetstream.Msg) (err err
 		produceCtx, produceCancel := context.WithTimeout(context.Background(), 30*time.Second)
 		defer produceCancel()
 
-		msgId := fmt.Sprintf("task-run-result-%d", runID)
+		msgId := fmt.Sprintf("task-run-result-%d-final", runID)
 		if _, pubErr := w.jq.Produce(produceCtx, envs.ResultTopicName, responseJson, msgId); pubErr != nil {
 			msgLogger.Error("failed to publish final job result", zap.String("jobResult", string(responseJson)), zap.Error(pubErr))
 		} else {
-			msgLogger.Info("Published final job result", zap.String("status", string(finalStatus)), zap.String("msgId", msgId))
+			msgLogger.Info("Published final job result", zap.Any("response", *response), zap.String("status", string(finalStatus)), zap.String("msgId", msgId))
 		}
 	}()