Merge pull request #731 from garden-io/rename-task-key-to-id

refactor: rename task baseKey to key and key to id
garden-io · Apr 29, 2019 · 6d8fdf1 · 6d8fdf1
2 parents 986a897 + f7cecce
commit 6d8fdf1
Show file tree

Hide file tree

Showing 13 changed files with 156 additions and 157 deletions.
diff --git a/garden-service/package-lock.json b/garden-service/package-lock.json
diff --git a/garden-service/src/commands/run/task.ts b/garden-service/src/commands/run/task.ts
@@ -60,7 +60,7 @@ export class RunTaskCommand extends Command<Args, Opts> {
     await garden.actions.prepareEnvironment({ log })
 
     const taskTask = await TaskTask.factory({ garden, graph, task, log, force: true, forceBuild: opts["force-build"] })
-    const result = (await garden.processTasks([taskTask]))[taskTask.getBaseKey()]
+    const result = (await garden.processTasks([taskTask]))[taskTask.getKey()]
 
     if (!result.error) {
       log.info("")

diff --git a/garden-service/src/logger/log-entry.ts b/garden-service/src/logger/log-entry.ts
@@ -25,9 +25,9 @@ export interface LogEntryMetadata { task?: TaskMetadata }
 
 export interface TaskMetadata {
   type: string,
-  baseKey: string,
+  key: string,
   status: TaskLogStatus,
-  id: string,
+  uid: string,
   versionString: string,
   durationMs?: number,
 }

diff --git a/garden-service/src/process.ts b/garden-service/src/process.ts
@@ -177,7 +177,7 @@ export async function processModules(
   await restartPromise
 
   return {
-    taskResults: {}, // TODO: Return latest results for each task baseKey processed between restarts?
+    taskResults: {}, // TODO: Return latest results for each task key processed between restarts?
     restartRequired: true,
   }