From 3ebe1dca29e49c0b809d6bce112e9b1768f7ce2f Mon Sep 17 00:00:00 2001
From: Jon Edvald <edvald@gmail.com>
Date: Thu, 7 Jun 2018 17:58:53 +0200
Subject: [PATCH] refactor: rename project.global to
 project.environmentDefaults (#131)

BREAKING CHANGE:
Existing garden.yml files will need to be updated if they use the
project.global key.
---
 examples/hello-world/garden.yml             | 2 +-
 src/garden.ts                               | 6 +++---
 src/plugins/kubernetes/system.ts            | 2 +-
 src/types/project.ts                        | 8 ++++----
 test/data/test-project-a/garden.yml         | 2 +-
 test/data/test-project-b/garden.yml         | 2 +-
 test/data/test-project-templated/garden.yml | 2 +-
 test/src/types/config.ts                    | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/examples/hello-world/garden.yml b/examples/hello-world/garden.yml
index 3a14de0bd1..368541e32e 100644
--- a/examples/hello-world/garden.yml
+++ b/examples/hello-world/garden.yml
@@ -1,6 +1,6 @@
 project:
   name: hello-world
-  global:
+  environmentDefaults:
     providers:
       - name: container
       - name: npm-package
diff --git a/src/garden.ts b/src/garden.ts
index a5c8db0a45..0318ec2ef5 100644
--- a/src/garden.ts
+++ b/src/garden.ts
@@ -215,7 +215,7 @@ export class Garden {
     }
 
     const projectName = parsedConfig.project.name
-    const globalConfig = parsedConfig.project.global || {}
+    const environmentDefaults = parsedConfig.project.environmentDefaults || {}
 
     const parts = env.split(".")
     const environment = parts[0]
@@ -248,7 +248,7 @@ export class Garden {
 
     const mergedProviders = merge(
       {},
-      keyBy(globalConfig.providers, "name"),
+      keyBy(environmentDefaults.providers, "name"),
       keyBy(envConfig.providers, "name"),
     )
 
@@ -256,7 +256,7 @@ export class Garden {
     const projectEnvConfig: EnvironmentConfig = {
       name: environment,
       providers: values(mergedProviders),
-      variables: merge({}, globalConfig.variables, envConfig.variables),
+      variables: merge({}, environmentDefaults.variables, envConfig.variables),
     }
 
     const buildDir = await BuildDir.factory(projectRoot)
diff --git a/src/plugins/kubernetes/system.ts b/src/plugins/kubernetes/system.ts
index 4e1108132a..a1c0667782 100644
--- a/src/plugins/kubernetes/system.ts
+++ b/src/plugins/kubernetes/system.ts
@@ -29,7 +29,7 @@ export async function getSystemGarden(provider: KubernetesProvider): Promise<Gar
       path: systemProjectPath,
       project: {
         name: "garden-system",
-        global: {
+        environmentDefaults: {
           providers: [
             { name: "container" },
           ],
diff --git a/src/types/project.ts b/src/types/project.ts
index 2260c7643b..d25a81a7ec 100644
--- a/src/types/project.ts
+++ b/src/types/project.ts
@@ -32,7 +32,7 @@ export interface EnvironmentConfig extends CommonEnvironmentConfig {
 export interface ProjectConfig {
   name: string
   defaultEnvironment: string
-  global: CommonEnvironmentConfig
+  environmentDefaults: CommonEnvironmentConfig
   environments: EnvironmentConfig[]
 }
 
@@ -75,7 +75,7 @@ export const environmentSchema = Joi.object().keys({
     .description("A key/value map of variables that modules can reference when using this environment."),
 })
 
-const defaultGlobal = {
+const environmentDefaults = {
   providers: defaultProviders,
   variables: {},
 }
@@ -88,8 +88,8 @@ export const projectSchema = Joi.object()
     defaultEnvironment: Joi.string()
       .default("", "<first specified environment>")
       .description("The default environment to use when calling commands without the `--env` parameter."),
-    global: environmentSchema
-      .default(() => defaultGlobal, JSON.stringify(defaultGlobal))
+    environmentDefaults: environmentSchema
+      .default(() => environmentDefaults, JSON.stringify(environmentDefaults))
       .description(
         "Default environment settings, that are inherited (but can be overridden) by each configured environment",
     ),
diff --git a/test/data/test-project-a/garden.yml b/test/data/test-project-a/garden.yml
index ed931cfda4..bd1f17723f 100644
--- a/test/data/test-project-a/garden.yml
+++ b/test/data/test-project-a/garden.yml
@@ -1,6 +1,6 @@
 project:
   name: test-project-a
-  global:
+  environmentDefaults:
     variables:
       some: variable
   environments:
diff --git a/test/data/test-project-b/garden.yml b/test/data/test-project-b/garden.yml
index faaa18c8d5..00fdd4b5b0 100644
--- a/test/data/test-project-b/garden.yml
+++ b/test/data/test-project-b/garden.yml
@@ -1,6 +1,6 @@
 project:
   name: test-project-b
-  global:
+  environmentDefaults:
     providers: []
   environments:
     - name: local
diff --git a/test/data/test-project-templated/garden.yml b/test/data/test-project-templated/garden.yml
index ad55a33764..04bac60717 100644
--- a/test/data/test-project-templated/garden.yml
+++ b/test/data/test-project-templated/garden.yml
@@ -1,6 +1,6 @@
 project:
   name: test-project-templated
-  global:
+  environmentDefaults:
     variables:
       some: ${local.env.TEST_VARIABLE}
       service-a-build-command: echo OK
diff --git a/test/src/types/config.ts b/test/src/types/config.ts
index 3432e4530e..35427611d3 100644
--- a/test/src/types/config.ts
+++ b/test/src/types/config.ts
@@ -14,7 +14,7 @@ describe("loadConfig", () => {
     expect(parsed.project).to.eql({
       name: "test-project-a",
       defaultEnvironment: "local",
-      global: {
+      environmentDefaults: {
         providers: [],
         variables: { some: "variable" },
       },