fix: do not run dependant tasks unless updated services depend on them

Tasks should not run if they are leaf nodes after watch triggers.
Otherwise tasks that have no dependants get run automatically, and we
want users to be able to define tasks that are only run manually.

garden-service/src/actions.ts

@@ -72,7 +72,7 @@ import { mapValues, values, keyBy, omit } from "lodash"
 import { Omit } from "./util/util"
 import { RuntimeContext } from "./types/service"
 import { processServices, ProcessResults } from "./process"
-import { getTasksForModule } from "./tasks/helpers"
+import { getDependantTasksForModule } from "./tasks/helpers"
 import { LogEntry } from "./logger/log-entry"
 import { createPluginContext } from "./plugin-context"
 import { CleanupEnvironmentParams } from "./types/plugin/params"
@@ -364,7 +364,7 @@ export class ActionHelper implements TypeGuard {
       garden: this.garden,
       log,
       watch: false,
-      handler: async (module) => getTasksForModule({
+      handler: async (module) => getDependantTasksForModule({
         garden: this.garden,
         log,
         module,

garden-service/src/commands/deploy.ts

@@ -18,7 +18,7 @@ import {
   StringsParameter,
 } from "./base"
 import { hotReloadAndLog, validateHotReloadOpt } from "./helpers"
-import { getTasksForModule, getHotReloadModuleNames } from "../tasks/helpers"
+import { getDependantTasksForModule, getHotReloadModuleNames } from "../tasks/helpers"
 import { TaskResults } from "../task-graph"
 import { processServices } from "../process"
 import { logHeader } from "../logger/util"
@@ -108,7 +108,7 @@ export class DeployCommand extends Command<Args, Opts> {
       logFooter,
       services,
       watch,
-      handler: async (module) => getTasksForModule({
+      handler: async (module) => getDependantTasksForModule({
         garden,
         log,
         module,
@@ -121,7 +121,7 @@ export class DeployCommand extends Command<Args, Opts> {
         if (hotReloadModuleNames.has(module.name)) {
           await hotReloadAndLog(garden, log, module)
         }
-        return getTasksForModule({
+        return getDependantTasksForModule({
           garden, log, module, hotReloadServiceNames, force: true, forceBuild: opts["force-build"],
           fromWatch: true, includeDependants: true,
         })

garden-service/src/commands/dev.ts

@@ -17,7 +17,7 @@ import { join } from "path"
 
 import { BaseTask } from "../tasks/base"
 import { hotReloadAndLog, validateHotReloadOpt } from "./helpers"
-import { getTasksForModule, getHotReloadModuleNames } from "../tasks/helpers"
+import { getDependantTasksForModule, getHotReloadModuleNames } from "../tasks/helpers"
 import {
   Command,
   CommandResult,
@@ -110,7 +110,7 @@ export class DevCommand extends Command<Args, Opts> {
         const testTasks: BaseTask[] = flatten(await Bluebird.map(
           testModules, m => getTestTasks({ garden, log, module: m })))
 
-        return testTasks.concat(await getTasksForModule({
+        return testTasks.concat(await getDependantTasksForModule({
           garden,
           log,
           module,

garden-service/src/tasks/helpers.ts

@@ -9,15 +9,13 @@
 import { flatten, intersection } from "lodash"
 import { DeployTask } from "./deploy"
 import { BuildTask } from "./build"
-import { TaskTask } from "./task"
 import { Garden } from "../garden"
 import { Module } from "../types/module"
 import { Service } from "../types/service"
-import { Task } from "../types/task"
 import { DependencyGraphNode } from "../dependency-graph"
 import { LogEntry } from "../logger/log-entry"
 
-export async function getTasksForModule(
+export async function getDependantTasksForModule(
   { garden, log, module, hotReloadServiceNames, force = false, forceBuild = false,
     fromWatch = false, includeDependants = false }:
     {
@@ -29,12 +27,10 @@ export async function getTasksForModule(
   let buildTasks: BuildTask[] = []
   let dependantBuildModules: Module[] = []
   let services: Service[] = []
-  let tasks: Task[] = []
 
   if (!includeDependants) {
     buildTasks.push(new BuildTask({ garden, log, module, force: true, fromWatch, hotReloadServiceNames }))
     services = module.services
-    tasks = module.tasks
   } else {
     const hotReloadModuleNames = await getHotReloadModuleNames(garden, hotReloadServiceNames)
     const dg = await garden.getDependencyGraph()
@@ -49,13 +45,12 @@ export async function getTasksForModule(
 
       dependantBuildModules = serviceDeps.build
       services = serviceDeps.service
-      tasks = serviceDeps.task
     } else {
       const dependants = await dg.getDependantsForModule(module, dependantFilterFn)
+
       buildTasks.push(new BuildTask({ garden, log, module, force: true, fromWatch, hotReloadServiceNames }))
       dependantBuildModules = dependants.build
       services = module.services.concat(dependants.service)
-      tasks = module.tasks.concat(dependants.task)
     }
   }
 
@@ -65,11 +60,8 @@ export async function getTasksForModule(
   const deployTasks = services
     .map(service => new DeployTask({ garden, log, service, force, forceBuild, fromWatch, hotReloadServiceNames }))
 
-  const taskTasks = tasks
-    .map(task => new TaskTask({ garden, log, task, force, forceBuild }))
-
-  const outputTasks = [...buildTasks, ...deployTasks, ...taskTasks]
-  log.silly(`getTasksForModule called for module ${module.name}, returning the following tasks:`)
+  const outputTasks = [...buildTasks, ...deployTasks]
+  log.silly(`getDependantTasksForModule called for module ${module.name}, returning the following tasks:`)
   log.silly(`  ${outputTasks.map(t => t.getBaseKey()).join(", ")}`)
 
   return outputTasks

garden-service/test/src/commands/deploy.ts

@@ -96,7 +96,7 @@ describe("DeployCommand", () => {
     const log = garden.log
     const command = new DeployCommand()
 
-    const { result } = await command.action({
+    const { result, errors } = await command.action({
       garden,
       log,
       args: {
@@ -110,6 +110,10 @@ describe("DeployCommand", () => {
       },
     })
 
+    if (errors) {
+      throw errors[0]
+    }
+
     expect(taskResultOutputs(result!)).to.eql({
       "build.module-a": { fresh: true, buildLog: "A" },
       "build.module-b": { fresh: true, buildLog: "B" },
@@ -131,7 +135,7 @@ describe("DeployCommand", () => {
     const log = garden.log
     const command = new DeployCommand()
 
-    const { result } = await command.action({
+    const { result, errors } = await command.action({
       garden,
       log,
       args: {
@@ -145,6 +149,10 @@ describe("DeployCommand", () => {
       },
     })
 
+    if (errors) {
+      throw errors[0]
+    }
+
     expect(taskResultOutputs(result!)).to.eql({
       "build.module-a": { fresh: true, buildLog: "A" },
       "build.module-b": { fresh: true, buildLog: "B" },