fix: properly handle build deps for pulumi and terraform modules

garden-io · Jul 20, 2023 · fbc2320 · fbc2320
1 parent 15428fd
commit fbc2320
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/plugins/pulumi/index.ts b/plugins/pulumi/index.ts
@@ -103,7 +103,7 @@ export const gardenPlugin = () =>
           configure: configurePulumiModule,
 
           async convert(params: ConvertModuleParams<PulumiModule>) {
-            const { module, dummyBuild, prepareRuntimeDependencies } = params
+            const { module, dummyBuild, convertBuildDependency, prepareRuntimeDependencies } = params
             const actions: (ExecBuildConfig | PulumiDeployConfig)[] = []
 
             if (dummyBuild) {
@@ -115,7 +115,12 @@ export const gardenPlugin = () =>
               type: "pulumi",
               name: module.name,
               ...params.baseFields,
-              dependencies: prepareRuntimeDependencies(module.spec.dependencies, dummyBuild),
+
+              build: dummyBuild?.name,
+              dependencies: [
+                ...module.build.dependencies.map(convertBuildDependency),
+                ...prepareRuntimeDependencies(module.spec.dependencies, dummyBuild),
+              ],
 
               timeout: defaultPulumiTimeoutSec,
               spec: {

diff --git a/plugins/terraform/index.ts b/plugins/terraform/index.ts
@@ -188,7 +188,7 @@ export const gardenPlugin = () =>
         needsBuild: false,
         handlers: {
           async convert(params: ConvertModuleParams<TerraformModule>) {
-            const { module, dummyBuild, prepareRuntimeDependencies } = params
+            const { module, dummyBuild, convertBuildDependency, prepareRuntimeDependencies } = params
             const actions: (ExecBuildConfig | TerraformDeployConfig)[] = []
 
             if (dummyBuild) {
@@ -202,7 +202,10 @@ export const gardenPlugin = () =>
               ...params.baseFields,
 
               build: dummyBuild?.name,
-              dependencies: prepareRuntimeDependencies(module.spec.dependencies, dummyBuild),
+              dependencies: [
+                ...module.build.dependencies.map(convertBuildDependency),
+                ...prepareRuntimeDependencies(module.spec.dependencies, dummyBuild),
+              ],
 
               timeout: defaultTerraformTimeoutSec,
               spec: {