fix(core): issue with partial module resolution and module templates

garden-io · May 24, 2024 · 1476007 · 1476007
1 parent 11059b7
commit 1476007
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 14 deletions.
diff --git a/core/src/garden.ts b/core/src/garden.ts
@@ -1022,6 +1022,10 @@ export class Garden {
     const resolvedProviders = await this.resolveProviders({ log, forceInit: false, statusOnly })
     const rawModuleConfigs = await this.getRawModuleConfigs()
 
+    if (actionsFilter) {
+      log.debug(`Partial resolution enabled for actions: ${actionsFilter.join(", ")}`)
+    }
+
     const graphLog = log.createLog({ name: "graph", showDuration: true }).info(`Resolving actions and modules...`)
 
     // Resolve the project module configs

diff --git a/core/src/resolve-module.ts b/core/src/resolve-module.ts
@@ -464,6 +464,12 @@ export class ModuleResolver {
     if (match(`build.${config.name}`)) {
       return true
     }
+
+    // Also need to match on the name of the templated module, if applicable
+    if (config.parentName && match(`build.${config.parentName}`)) {
+      return true
+    }
+
     for (const s of config.serviceConfigs) {
       if (match(`deploy.${s}`)) {
         return true
@@ -487,7 +493,7 @@ export class ModuleResolver {
    * as well as any immediately resolvable declared build dependencies.
    */
   private getModuleDependenciesFromConfig(rawConfig: ModuleConfig, buildPath: string) {
-    const configContext = new ModuleConfigContext({
+    const contextParams = {
       garden: this.garden,
       variables: this.garden.variables,
       resolvedProviders: this.resolvedProviders,
@@ -496,11 +502,16 @@ export class ModuleResolver {
       buildPath,
       parentName: rawConfig.parentName,
       templateName: rawConfig.templateName,
-      inputs: rawConfig.inputs,
+      inputs: {},
       modules: [],
       graphResults: this.graphResults,
       partialRuntimeResolution: true,
-    })
+    }
+
+    // Template inputs are commonly used in module deps, so we need to resolve them first
+    contextParams.inputs = this.resolveInputs(rawConfig, new ModuleConfigContext(contextParams))
+
+    const configContext = new ModuleConfigContext(contextParams)
 
     const templateRefs = getModuleTemplateReferences(rawConfig, configContext)
     const templateDeps = <string[]>templateRefs.filter((d) => d[1] !== rawConfig.name).map((d) => d[1])
@@ -523,7 +534,7 @@ export class ModuleResolver {
         .map((d) => (isString(d) ? d : d.name))
     }
 
-    const deps = [...templateDeps, ...buildDeps]
+    const deps = uniq([...templateDeps, ...buildDeps])
 
     return deps.map((name) => {
       const moduleConfig = this.rawConfigsByKey[name]
@@ -541,6 +552,22 @@ export class ModuleResolver {
     return getLinkedSources(this.garden, "module")
   }
 
+  private resolveInputs(config: ModuleConfig, configContext: ModuleConfigContext) {
+    const inputs = cloneDeep(config.inputs || {})
+
+    if (!config.templateName) {
+      return inputs
+    }
+
+    return resolveTemplateStrings({
+      value: inputs,
+      context: configContext,
+      contextOpts: { allowPartial: true },
+      // Note: We're not implementing the YAML source mapping for modules
+      source: undefined,
+    })
+  }
+
   /**
    * Resolves and validates a single module configuration.
    */
@@ -574,14 +601,7 @@ export class ModuleResolver {
     if (templateName) {
       const template = this.garden.configTemplates[templateName]
 
-      inputs = resolveTemplateStrings({
-        value: inputs,
-        context: new ModuleConfigContext(templateContextParams),
-        // Not all inputs may need to be resolvable
-        contextOpts: { allowPartial: true },
-        // Note: We're not implementing the YAML source mapping for modules
-        source: undefined,
-      })
+      inputs = this.resolveInputs(config, new ModuleConfigContext(templateContextParams))
 
       inputs = validateWithPath({
         config: inputs,
@@ -655,12 +675,12 @@ export class ModuleResolver {
     //   - name: foo-module // same as the above
     //
     // Empty strings and nulls are omitted from the array.
-    if (config.build && config.build.dependencies) {
+    if (config.build?.dependencies) {
       config.build.dependencies = prepareBuildDependencies(config.build.dependencies).filter((dep) => dep.name)
     }
 
     // We need to refilter the build dependencies on the spec in case one or more dependency names resolved to null.
-    if (config.spec.build && config.spec.build.dependencies) {
+    if (config.spec.build?.dependencies) {
       config.spec.build.dependencies = prepareBuildDependencies(config.spec.build.dependencies)
     }