fix(config): module variables weren't propagated right at parse time

That's a facepalm...
garden-io · Aug 6, 2021 · b1c52fa · b1c52fa
1 parent 3764dfa
commit b1c52fa
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/core/src/config/base.ts b/core/src/config/base.ts
@@ -186,6 +186,7 @@ export function prepareModuleResource(spec: any, configPath: string, projectRoot
     testConfigs: [],
     type: spec.type,
     taskConfigs: [],
+    variables: spec.variables,
   }
 
   validateWithPath({

diff --git a/core/test/data/test-project-a/module-a/garden.yml b/core/test/data/test-project-a/module-a/garden.yml
@@ -1,17 +1,19 @@
 kind: Module
 name: module-a
 type: test
+variables:
+  msg: OK
 services:
   - name: service-a
 build:
   command: [echo, A]
 tests:
   - name: unit
-    command: [echo, OK]
+    command: [echo, "${var.msg}"]
   - name: integration
-    command: [echo, OK]
-    dependencies: 
+    command: [echo, "${var.msg}"]
+    dependencies:
       - service-a
 tasks:
   - name: task-a
-    command: [echo, OK]
+    command: [echo, "${var.msg}"]
diff --git a/core/test/unit/src/config/base.ts b/core/test/unit/src/config/base.ts
@@ -132,6 +132,7 @@ describe("loadConfigResources", () => {
         allowPublish: undefined,
         build: { dependencies: [] },
         path: modulePathA,
+        variables: { msg: "OK" },
 
         spec: {
           build: {
@@ -142,17 +143,17 @@ describe("loadConfigResources", () => {
           tasks: [
             {
               name: "task-a",
-              command: ["echo", "OK"],
+              command: ["echo", "${var.msg}"],
             },
           ],
           tests: [
             {
               name: "unit",
-              command: ["echo", "OK"],
+              command: ["echo", "${var.msg}"],
             },
             {
               name: "integration",
-              command: ["echo", "OK"],
+              command: ["echo", "${var.msg}"],
               dependencies: ["service-a"],
             },
           ],
@@ -274,6 +275,7 @@ describe("loadConfigResources", () => {
         },
         testConfigs: [],
         taskConfigs: [],
+        variables: undefined,
       },
     ])
   })
@@ -312,6 +314,7 @@ describe("loadConfigResources", () => {
         },
         testConfigs: [],
         taskConfigs: [],
+        variables: undefined,
       },
       {
         apiVersion: "garden.io/v0",
@@ -340,6 +343,7 @@ describe("loadConfigResources", () => {
         },
         testConfigs: [],
         taskConfigs: [],
+        variables: undefined,
       },
     ])
   })

diff --git a/examples/demo-project/backend/garden.yml b/examples/demo-project/backend/garden.yml
@@ -2,6 +2,11 @@ kind: Module
 name: backend
 description: Backend service container
 type: container
+
+# You can specify variables here at the module level
+variables:
+  ingressPath: /hello-backend
+
 services:
   - name: backend
     ports:
@@ -10,8 +15,9 @@ services:
         # Maps service:80 -> container:8080
         servicePort: 80
     ingresses:
-      - path: /hello-backend
+      - path: ${var.ingressPath}
         port: http
+
 tasks:
   - name: test
     command: ["sh", "-c", "echo task output"]