improvement(api): send action type to cloud (#5447)

Before this improvement we weren't sending the action type to Cloud due
to some legacy issues which have since been resolved.

The action type is used in Cloud in e.g. the graph UI and on command
results.

Note that Cloud has already been updated to handle the action type and
those changes rolled out to all users, so this is only required Core
side work.

core/src/actions/types.ts

@@ -134,7 +134,7 @@ export interface ActionDependencyAttributes {
   needsExecutedOutputs: boolean // Set to true if action cannot be resolved without the dependency executed
 }
 
-export type ActionDependency = ActionReference & ActionDependencyAttributes
+export type ActionDependency = ActionReference & ActionDependencyAttributes & { type: string }
 
 export interface ActionModes {
   sync?: boolean

core/src/events/util.ts

@@ -75,8 +75,8 @@ export function makeActionStatusPayloadBase({
     actionName: action.name,
     actionVersion: action.versionString(),
     // NOTE: The type/kind needs to be lower case in the event payload
-    actionType: action.kind.toLowerCase(),
     actionKind: action.kind.toLowerCase(),
+    actionType: action.type,
     actionUid: action.uid,
     moduleName: action.moduleName(),
     sessionId,

core/src/graph/actions.ts

@@ -40,7 +40,7 @@ import { describeSchema, parseActionReference } from "../config/common.js"
 import type { GroupConfig } from "../config/group.js"
 import { ActionConfigContext } from "../config/template-contexts/actions.js"
 import { validateWithPath } from "../config/validation.js"
-import { ConfigurationError, PluginError, InternalError, ValidationError, GardenError } from "../exceptions.js"
+import { ConfigurationError, PluginError, InternalError, GardenError } from "../exceptions.js"
 import { overrideVariables, type Garden } from "../garden.js"
 import type { Log } from "../logger/log-entry.js"
 import type { ActionTypeDefinition } from "../plugin/action-types.js"
@@ -916,17 +916,27 @@ function dependenciesFromActionConfig({
   }
 
   const deps: ActionDependency[] = config.dependencies.map((d) => {
-    try {
-      const { kind, name } = parseActionReference(d)
-      return { kind, name, explicit: true, needsExecutedOutputs: false, needsStaticOutputs: false }
-    } catch (error) {
-      throw new ValidationError({
-        message: `Invalid dependency specified: ${error}`,
+    const { kind, name } = parseActionReference(d)
+    const depKey = actionReferenceToString(d)
+    const depConfig = configsByKey[depKey]
+
+    if (!depConfig) {
+      throw new ConfigurationError({
+        message: `${description} references depdendency ${depKey}, but no such action could be found`,
       })
     }
+
+    return {
+      kind,
+      name,
+      type: depConfig.type,
+      explicit: true,
+      needsExecutedOutputs: false,
+      needsStaticOutputs: false,
+    }
   })
 
-  function addDep(ref: ActionReference, attributes: ActionDependencyAttributes) {
+  function addDep(ref: ActionReference & { type: string }, attributes: ActionDependencyAttributes) {
     addActionDependency({ ...ref, ...attributes }, deps)
   }
 
@@ -943,7 +953,12 @@ function dependenciesFromActionConfig({
         })
       }
 
-      addDep(ref, { explicit: true, needsExecutedOutputs: false, needsStaticOutputs: false })
+      const refWithType = {
+        ...ref,
+        type: config.type,
+      }
+
+      addDep(refWithType, { explicit: true, needsExecutedOutputs: false, needsStaticOutputs: false })
     }
   } else if (config.build) {
     // -> build field on runtime actions
@@ -956,7 +971,11 @@ function dependenciesFromActionConfig({
       })
     }
 
-    addDep(ref, { explicit: true, needsExecutedOutputs: false, needsStaticOutputs: false })
+    const refWithType = {
+      ...ref,
+      type: config.type,
+    }
+    addDep(refWithType, { explicit: true, needsExecutedOutputs: false, needsStaticOutputs: false })
   }
 
   // Action template references in spec/variables
@@ -1003,7 +1022,12 @@ function dependenciesFromActionConfig({
       needsExecuted = true
     }
 
-    addDep(ref, { explicit: false, needsExecutedOutputs: needsExecuted, needsStaticOutputs: !needsExecuted })
+    const refWithType = {
+      ...ref,
+      type: refActionType,
+    }
+
+    addDep(refWithType, { explicit: false, needsExecutedOutputs: needsExecuted, needsStaticOutputs: !needsExecuted })
   }
 
   return deps

core/src/graph/config-graph.ts

@@ -38,6 +38,7 @@ export type RenderedEdge = { dependant: RenderedNode; dependency: RenderedNode }
 export interface RenderedNode {
   kind: ActionKind
   name: string
+  type: string
   moduleName?: string
   key: string
   disabled: boolean
@@ -481,19 +482,20 @@ export abstract class BaseConfigGraph<
 
   protected addActionInternal<K extends ActionKind>(action: Action) {
     this.actions[action.kind][action.name] = <PickTypeByKind<K, B, D, R, T>>action
-    const node = this.getNode(action.kind, action.name, action.isDisabled())
+    const node = this.getNode(action.kind, action.type, action.name, action.isDisabled())
 
     for (const dep of action.getDependencyReferences()) {
       this.addRelation({
         dependant: node,
         dependencyKind: dep.kind,
+        dependencyType: dep.type,
         dependencyName: dep.name,
       })
     }
   }
 
   // Idempotent.
-  protected getNode(kind: ActionKind, name: string, disabled: boolean) {
+  protected getNode(kind: ActionKind, type: string, name: string, disabled: boolean) {
     const key = nodeKey(kind, name)
     const existingNode = this.dependencyGraph[key]
     if (existingNode) {
@@ -502,7 +504,7 @@ export abstract class BaseConfigGraph<
       }
       return existingNode
     } else {
-      const newNode = new ConfigGraphNode(kind, name, disabled)
+      const newNode = new ConfigGraphNode(kind, type, name, disabled)
       this.dependencyGraph[key] = newNode
       return newNode
     }
@@ -512,13 +514,15 @@ export abstract class BaseConfigGraph<
   protected addRelation({
     dependant,
     dependencyKind,
+    dependencyType,
     dependencyName,
   }: {
     dependant: ConfigGraphNode
     dependencyKind: ActionKind
+    dependencyType: string
     dependencyName: string
   }) {
-    const dependency = this.getNode(dependencyKind, dependencyName, false)
+    const dependency = this.getNode(dependencyKind, dependencyType, dependencyName, false)
     dependant.addDependency(dependency)
     dependency.addDependant(dependant)
   }
@@ -543,11 +547,12 @@ export class MutableConfigGraph extends ConfigGraph {
     const dependant = this.getActionByRef(by)
     const dependency = this.getActionByRef(on)
 
-    dependant.addDependency({ kind: dependency.kind, name: dependency.name, ...attributes })
+    dependant.addDependency({ kind: dependency.kind, type: dependency.type, name: dependency.name, ...attributes })
 
     this.addRelation({
-      dependant: this.getNode(dependant.kind, dependant.name, dependant.isDisabled()),
+      dependant: this.getNode(dependant.kind, dependant.type, dependant.name, dependant.isDisabled()),
       dependencyKind: dependency.kind,
+      dependencyType: dependency.type,
       dependencyName: dependency.name,
     })
   }
@@ -568,6 +573,7 @@ export class ConfigGraphNode {
 
   constructor(
     public kind: ActionKind,
+    public type: string,
     public name: string,
     public disabled: boolean
   ) {
@@ -581,6 +587,7 @@ export class ConfigGraphNode {
       kind: this.kind,
       key: this.name,
       disabled: this.disabled,
+      type: this.type,
     }
   }
 

core/src/util/testing.ts

@@ -300,11 +300,25 @@ export class TestGarden extends Garden {
     this.addActionConfig(config)
   }
 
+  /**
+   * Replace all module configs with the one provided.
+   */
   setModuleConfigs(moduleConfigs: PartialModuleConfig[]) {
     this.state.configsScanned = true
     this.moduleConfigs = keyBy(moduleConfigs.map(moduleConfigWithDefaults), "name")
   }
 
+  /**
+   * Merge the provided module configs with the existing ones.
+   */
+  mergeModuleConfigs(moduleConfigs: PartialModuleConfig[]) {
+    this.state.configsScanned = true
+    this.moduleConfigs = {
+      ...this.moduleConfigs,
+      ...keyBy(moduleConfigs.map(moduleConfigWithDefaults), "name"),
+    }
+  }
+
   setActionConfigs(actionConfigs: PartialActionConfig[]) {
     this.actionConfigs = {
       Build: {},

core/test/data/test-projects/kubernetes-type/module-simple/garden.yml

@@ -43,7 +43,6 @@ tasks:
     command: [sh, -c, "echo ok"]
 
 ---
-
 kind: Run
 name: echo-run-exec
 type: kubernetes-exec
@@ -56,7 +55,6 @@ spec:
   command: [echo, ok]
 
 ---
-
 kind: Test
 name: echo-test-exec
 type: kubernetes-exec
@@ -66,4 +64,4 @@ spec:
   resource:
     kind: Deployment
     name: busybox-deployment
-  command: [echo, ok]
+  command: [echo, ok]

core/test/integ/src/plugins/kubernetes/kubernetes-type/handlers.ts

@@ -115,7 +115,7 @@ describe("kubernetes-type handlers", () => {
   }
 
   async function deployInNamespace({ nsName, deployName }: { nsName: string; deployName: string }) {
-    garden.setModuleConfigs([withNamespace(nsModuleConfig, nsName)])
+    garden.mergeModuleConfigs([withNamespace(nsModuleConfig, nsName)])
     const graph = await garden.getConfigGraph({ log, emit: false })
     const action = graph.getDeploy(deployName)
     const resolvedAction = await garden.resolveAction<KubernetesDeployAction>({ action, log: garden.log, graph })

core/test/unit/src/actions/action-configs-to-graph.ts

@@ -237,6 +237,7 @@ describe("actionConfigsToGraph", () => {
         explicit: true,
         kind: "Build",
         name: "foo",
+        type: "test",
         needsExecutedOutputs: false,
         needsStaticOutputs: false,
       },
@@ -283,6 +284,7 @@ describe("actionConfigsToGraph", () => {
       {
         explicit: true,
         kind: "Build",
+        type: "test",
         name: "foo",
         needsExecutedOutputs: false,
         needsStaticOutputs: false,
@@ -331,6 +333,7 @@ describe("actionConfigsToGraph", () => {
       {
         explicit: false,
         kind: "Build",
+        type: "test",
         name: "foo",
         fullRef: ["actions", "build", "foo", "version"],
         needsExecutedOutputs: false,
@@ -380,6 +383,7 @@ describe("actionConfigsToGraph", () => {
       {
         explicit: false,
         kind: "Build",
+        type: "test",
         name: "foo",
         fullRef: ["actions", "build", "foo", "outputs", "bar"],
         needsExecutedOutputs: true,
@@ -429,6 +433,7 @@ describe("actionConfigsToGraph", () => {
       {
         explicit: false,
         kind: "Build",
+        type: "container",
         name: "foo",
         fullRef: ["actions", "build", "foo", "outputs", "deploymentImageName"],
         needsExecutedOutputs: false,