Merge pull request #3112 from uselagoon/feature/cancel-tasks

feat: API changes to support cancelling tasks
uselagoon · Jul 17, 2023 · 5cdbb52 · 5cdbb52
2 parents 54a5f43 + 3283e96
commit 5cdbb52
Show file tree

Hide file tree

Showing 10 changed files with 427 additions and 190 deletions.
diff --git a/node-packages/commons/src/tasks.ts b/node-packages/commons/src/tasks.ts
@@ -1302,6 +1302,10 @@ export const createMiscTask = async function(taskData: any) {
           }
           miscTaskData.advancedTask = taskData.data.advancedTask
           break;
+        case 'kubernetes:task:cancel':
+          // task cancellation is just a standard unmodified message
+          miscTaskData.misc = taskData.data.task
+          break;
         case 'kubernetes:build:cancel':
           // build cancellation is just a standard unmodified message
           miscTaskData.misc = taskData.data.build

diff --git a/services/actions-handler/handler/controller_tasks.go b/services/actions-handler/handler/controller_tasks.go
@@ -86,10 +86,16 @@ func (m *Messenger) handleTask(ctx context.Context, messageQueue *mq.MessageQueu
 	taskId, _ := strconv.Atoi(message.Meta.Task.ID)
 	// prepare the task patch for later step
 	updateTaskPatch := schema.UpdateTaskPatchInput{
-		RemoteID:  message.Meta.RemoteID,
-		Status:    schema.StatusTypes(strings.ToUpper(message.Meta.JobStatus)),
-		Started:   message.Meta.StartTime,
-		Completed: message.Meta.EndTime,
+		Status: schema.StatusTypes(strings.ToUpper(message.Meta.JobStatus)),
+	}
+	if message.Meta.RemoteID != "" {
+		updateTaskPatch.RemoteID = message.Meta.RemoteID
+	}
+	if message.Meta.StartTime != "" {
+		updateTaskPatch.Started = message.Meta.StartTime
+	}
+	if message.Meta.EndTime != "" {
+		updateTaskPatch.Completed = message.Meta.EndTime
 	}
 	updatedTask, err := lagoon.UpdateTask(ctx, taskId, updateTaskPatch, l)
 	if err != nil {

diff --git a/services/api/src/mocks.js b/services/api/src/mocks.js
@@ -706,6 +706,7 @@ mocks.Mutation = () => ({
   taskDrushRsyncFiles: () => mocks.Task(),
   deleteTask: () => 'success',
   updateTask: () => mocks.Task(),
+  cancelTask: () => faker.random.arrayElement(['success', 'Task not cancelled, reason: Too slow.']),
   setEnvironmentServices: () => [ mocks.EnvironmentService() ],
   uploadFilesForTask: () => mocks.Task(),
   deleteFilesForTask: () => 'success',

diff --git a/services/api/src/resolvers.js b/services/api/src/resolvers.js
@@ -69,6 +69,7 @@ const {
   addTask,
   deleteTask,
   updateTask,
+  cancelTask,
   taskDrushArchiveDump,
   taskDrushSqlDump,
   taskDrushCacheClear,
@@ -601,6 +602,7 @@ const resolvers = {
     taskDrushUserLogin,
     deleteTask,
     updateTask,
+    cancelTask,
     setEnvironmentServices,
     uploadFilesForTask,
     deleteFilesForTask,