Merge pull request #490 from garden-io/fix-templating-issue

fix(core): certain template strings could not be resolved in configs

docs/examples/hello-world.md

@@ -48,12 +48,19 @@ module:
   name: hello-container
   services:
     ...
-      env:
-        FUNCTION_ENDPOINT: ${services.hello-function.outputs.endpoint}
       dependencies:
         - hello-function
+      env:
+        FUNCTION_ENDPOINT: ${modules.hello-function.outputs.endpoint}
 ```
 
+Note the added `dependencies` key, which specified `hello-function` as a runtime dependency for the `hello-container`
+service.
+
+Here we also reference the module outputs from the OpenFaaS module using a templated string, in order to inform the
+container service where the endpoint for the function is. Please refer to individual provider docs on which values
+are exposed under the `outputs` key on different module types.
+
 Test dependencies will be covered further ahead.
 
 # Defining ports, endpoints, and health checks

docs/reference/module-types/container.md

@@ -113,14 +113,6 @@ The names of any services that this service depends on at runtime, and the names
 | Type | Required |
 | ---- | -------- |
 | `array[string]` | No
-### `module.services[].outputs`
-[module](#module) > [services](#module.services[]) > outputs
-
-Key/value map. Keys must be valid identifiers.
-
-| Type | Required |
-| ---- | -------- |
-| `object` | No
 ### `module.services[].args[]`
 [module](#module) > [services](#module.services[]) > args
 
@@ -493,7 +485,6 @@ module:
   services:
     - name:
       dependencies: []
-      outputs: {}
       args:
       daemon: false
       ingresses:

docs/reference/template-strings.md

@@ -100,17 +100,6 @@ environment:
 modules: 
   {}
 
-# Retrieve information about services that are defined in the project.
-#
-# Example:
-#   my-service:
-#     outputs:
-#       ingress: 'http://my-service/path/to/endpoint'
-#     version: v17ad4cb3fd
-#
-services: 
-  {}
-
 # A map of all configured plugins/providers for this environment and their configuration.
 #
 # Example:

examples/hello-world/services/hello-container/garden.yml

@@ -18,7 +18,7 @@ module:
       dependencies:
         - hello-function
       env:
-        FUNCTION_ENDPOINT: ${services.hello-function.outputs.endpoint}
+        FUNCTION_ENDPOINT: ${modules.hello-function.outputs.endpoint}
   build:
     dependencies:
       - name: hello-npm-package
@@ -31,6 +31,6 @@ module:
     - name: integ
       args: [npm, run, integ]
       env:
-        FUNCTION_ENDPOINT: ${services.hello-function.outputs.endpoint}
+        FUNCTION_ENDPOINT: ${modules.hello-function.outputs.endpoint}
       dependencies:
         - hello-function

garden-service/bin/add-version-files.ts

@@ -17,7 +17,8 @@ async function addVersionFiles() {
   const staticPath = resolve(__dirname, "..", "static")
   const garden = await Garden.factory(staticPath)
 
-  const modules = await garden.getModules()
+  const graph = await garden.getConfigGraph()
+  const modules = await graph.getModules()
 
   return Bluebird.map(modules, async (module) => {
     const path = module.path