From 304211b1d26d54b5a05e18f9e410752f0621c21b Mon Sep 17 00:00:00 2001 From: Jon Edvald Date: Mon, 2 Sep 2019 17:48:19 +0200 Subject: [PATCH] chore: clean up old config formats from examples and tests --- docs/using-garden/configuration-files.md | 5 +- examples/ambassador/README.md | 86 +++++++++---------- examples/ambassador/ambassador/garden.yml | 34 ++++---- examples/ambassador/garden.yml | 14 +-- examples/ambassador/go-service/garden.yml | 38 ++++---- examples/ambassador/node-service/garden.yml | 52 +++++------ examples/hot-reload/garden.yml | 3 - examples/local-tls/garden.yml | 24 +++--- .../local-tls/services/go-service/garden.yml | 24 +++--- .../services/node-service/garden.yml | 48 +++++------ garden-service/static/garden.yml | 24 +++--- .../system/default-backend/garden.yml | 20 ++--- .../system/ingress-controller/garden.yml | 36 ++++---- .../system/kubernetes-dashboard/garden.yml | 34 ++++---- .../static/local-gcf-container/garden.yml | 8 +- .../test/unit/data/test-project-a/garden.yml | 21 +++-- .../data/test-project-a/module-a/garden.yml | 30 +++---- .../data/test-project-a/module-b/garden.yml | 32 +++---- .../data/test-project-a/module-c/garden.yml | 32 +++---- .../data/test-project-auto-reload/garden.yml | 12 +-- .../module-a/garden.yml | 28 +++--- .../module-b/garden.yml | 34 ++++---- .../module-c/garden.yml | 28 +++--- .../module-d/garden.yml | 34 ++++---- .../module-e/garden.yml | 34 ++++---- .../module-f/garden.yml | 34 ++++---- .../test/unit/data/test-project-b/garden.yml | 14 ++- .../data/test-project-b/module-a/garden.yml | 40 ++++----- .../data/test-project-b/module-b/garden.yml | 32 +++---- .../data/test-project-b/module-c/garden.yml | 50 +++++------ .../test-project-build-products/garden.yml | 12 +-- .../module-a/garden.yml | 10 +-- .../module-b/garden.yml | 22 ++--- .../module-c/garden.yml | 10 +-- .../module-d/garden.yml | 44 +++++----- .../module-e/garden.yml | 20 ++--- .../test-project-circular-deps/garden.yml | 12 +-- .../module-a/garden.yml | 20 ++--- .../module-b/garden.yml | 22 ++--- .../module-c/garden.yml | 20 ++--- .../data/test-project-container/garden.yml | 12 +-- .../module-a/garden.yml | 32 +++---- .../build-dependant/garden.yml | 30 +++---- .../build-dependency/garden.yml | 24 +++--- .../data/test-project-dependants/garden.yml | 14 ++- .../good-evening/garden.yml | 24 +++--- .../good-morning/garden.yml | 38 ++++---- .../service-dependant/garden.yml | 40 ++++----- .../service-dependant2/garden.yml | 38 ++++---- .../garden.yml | 24 +++--- .../garden.yaml | 21 +++-- .../garden.yml | 21 +++-- .../unit/data/test-project-empty/garden.yml | 12 +-- .../unit/data/test-project-exec/garden.yml | 21 +++-- .../test-project-exec/module-a/garden.yml | 34 ++++---- .../test-project-exec/module-b/garden.yml | 20 ++--- .../test-project-exec/module-c/garden.yml | 18 ++-- .../module-b/garden.yml | 22 ++--- .../module-c/garden.yml | 22 ++--- .../garden.yml | 35 ++++---- .../data/test-project-flat-config/garden.yml | 5 +- .../test-project-invalid-config/garden.yml | 12 +-- .../module-a/garden.yml | 20 ++--- .../module-b/garden.yml | 20 ++--- .../source-a/module-a/garden.yml | 20 ++--- .../source-b/module-b/garden.yml | 20 ++--- .../source-c/module-c/garden.yml | 20 ++--- .../test-project-missing-provider/garden.yml | 14 +-- .../data/test-project-templated/garden.yml | 19 ++-- .../module-a/garden.yml | 22 ++--- .../module-b/garden.yml | 26 +++--- .../data/test-project-test-deps/garden.yml | 12 +-- .../module-a/garden.yml | 30 +++---- .../module-b/garden.yml | 12 +-- .../garden.yml | 17 ++-- .../module-a/garden.yml | 16 ++-- .../module-b/garden.yml | 16 ++-- .../double-module/garden.yml | 52 +++++------ .../unit/data/test-project-watch/garden.yml | 21 +++-- .../test-project-watch/module-a/garden.yml | 26 +++--- .../with-include/garden.yml | 8 +- .../garden.yaml | 21 +++-- .../module-no-config/foo.yml | 6 +- .../module-yaml/garden.yaml | 6 +- .../module-yml/garden.yml | 6 +- .../test-projects/duplicate-module/garden.yml | 12 +-- .../duplicate-module/module-a/garden.yml | 6 +- .../duplicate-module/module-b/garden.yml | 6 +- .../duplicate-service-and-task/garden.yml | 12 +-- .../module-a/garden.yml | 10 +-- .../module-b/garden.yml | 10 +-- .../duplicate-service/garden.yml | 12 +-- .../duplicate-service/module-a/garden.yml | 10 +-- .../duplicate-service/module-b/garden.yml | 10 +-- .../test-projects/duplicate-task/garden.yml | 12 +-- .../duplicate-task/module-a/garden.yml | 10 +-- .../duplicate-task/module-b/garden.yml | 10 +-- .../data/test-projects/helm/api/garden.yml | 30 +++---- .../helm/chart-with-test-pod/garden.yml | 6 +- .../duplicate-keys-in-template/garden.yml | 8 +- .../unit/data/test-projects/helm/garden.yml | 12 +-- .../test-projects/helm/postgres/garden.yml | 86 +++++++++---------- .../test-projects/include-exclude/garden.yml | 12 +-- .../missing-deps/missing-build-dep/garden.yml | 19 ++-- .../missing-build-dep/module-a/garden.yml | 30 +++---- .../missing-build-dep/module-b/garden.yml | 32 +++---- .../missing-build-dep/module-c/garden.yml | 28 +++--- .../missing-runtime-dep/garden.yml | 19 ++-- .../missing-runtime-dep/module-a/garden.yml | 30 +++---- .../missing-runtime-dep/module-b/garden.yml | 32 +++---- .../missing-runtime-dep/module-c/garden.yml | 28 +++--- .../test-projects/module-self-ref/garden.yml | 12 +-- .../multiple-module-config/garden.yml | 19 ++-- .../module-b/garden.yml | 64 +++++++------- .../module-c/garden.yml | 28 +++--- .../new-provider-spec/garden.yml | 3 - .../non-string-template-values/garden.yml | 16 ++-- .../test-projects/source-module/garden.yml | 12 +-- .../source-module/module-a/garden.yml | 10 +-- .../source-module/module-b/garden.yml | 12 +-- .../unit/data/validate/bad-module/garden.yml | 4 +- .../unit/data/validate/bad-project/garden.yml | 4 +- .../validate/bad-project/ok-module/garden.yml | 10 +-- garden-service/test/unit/src/config/base.ts | 16 +--- 124 files changed, 1351 insertions(+), 1397 deletions(-) diff --git a/docs/using-garden/configuration-files.md b/docs/using-garden/configuration-files.md index 19e4b32a4a..cb588f4253 100644 --- a/docs/using-garden/configuration-files.md +++ b/docs/using-garden/configuration-files.md @@ -27,14 +27,13 @@ We'll start by looking at the top-level [project configuration file](https://git # examples/openfaas/garden.yml kind: Project name: openfaas -environmentDefaults: - variables: - my-variable: hello-variable environments: - name: local providers: - name: local-kubernetes - name: openfaas +variables: + my-variable: hello-variable ``` The project-wide `garden.yml` defines the project's name, the default configuration used for each diff --git a/examples/ambassador/README.md b/examples/ambassador/README.md index b1d37c9202..ecf5c35b9b 100644 --- a/examples/ambassador/README.md +++ b/examples/ambassador/README.md @@ -49,13 +49,13 @@ Hello from Node service! If you've looked at our other examples, the project configuration should look familiar with the exception of the `setupIngressController` key: ```yaml -project: - name: custom-ingress-controller - environments: - - name: local - providers: - - name: local-kubernetes - setupIngressController: false +kind: Project +name: custom-ingress-controller +environments: + - name: local + providers: + - name: local-kubernetes + setupIngressController: false ``` The `setupIngressController` key is specific to the `local-kubernetes` plugin. Setting it to `false` disables the default Nginx ingress controller. @@ -65,23 +65,23 @@ The `setupIngressController` key is specific to the `local-kubernetes` plugin. S We've configured the Ambassador service to listen on port `8080` since the default Nginx ingress controller might occupy the default port (`80`) if we're running other Garden projects. Here's the relevant configuration from `ambassador/garden.yml`: ```yaml -module: - description: Ambassador API Gateway - type: helm - name: ambassador - chart: stable/ambassador - values: - service: - annotations: - getambassador.io/config: | - --- - apiVersion: ambassador/v1 - kind: Module - name: ambassador - config: - service_port: 8080 # Set port since the default ingress already occupies the default port - http: - port: 8080 # Set port since the default ingress already occupies the default port +kind: Module +description: Ambassador API Gateway +type: helm +name: ambassador +chart: stable/ambassador +values: + service: + annotations: + getambassador.io/config: | + --- + apiVersion: ambassador/v1 + kind: Module + name: ambassador + config: + service_port: 8080 # Set port since the default ingress already occupies the default port + http: + port: 8080 # Set port since the default ingress already occupies the default port ``` ### Module configuration @@ -89,25 +89,25 @@ module: The module configuration is the same as for the `simple-project` example with the exception of annotations. Below is the configuration for our `go-service`: ```yaml -module: - name: go-service - description: Go service container - type: container - services: - - name: go-service - ports: - - name: http - containerPort: 8080 - # Maps service:80 -> container:8080 - servicePort: 80 - annotations: - getambassador.io/config: | - --- - apiVersion: ambassador/v1 - kind: Mapping - name: go-service_mapping - prefix: /go-service/ - service: go-service:80 +kind: Module +name: go-service +description: Go service container +type: container +services: + - name: go-service + ports: + - name: http + containerPort: 8080 + # Maps service:80 -> container:8080 + servicePort: 80 + annotations: + getambassador.io/config: | + --- + apiVersion: ambassador/v1 + kind: Mapping + name: go-service_mapping + prefix: /go-service/ + service: go-service:80 ``` Please refer to the [official Ambassador docs](https://www.getambassador.io/reference/mappings/) for more information on how to configure route mappings. diff --git a/examples/ambassador/ambassador/garden.yml b/examples/ambassador/ambassador/garden.yml index 4dc22a5162..aaa2a2375a 100644 --- a/examples/ambassador/ambassador/garden.yml +++ b/examples/ambassador/ambassador/garden.yml @@ -1,17 +1,17 @@ -module: - description: Ambassador API Gateway - type: helm - name: ambassador - chart: stable/ambassador - values: - service: - annotations: - getambassador.io/config: | - --- - apiVersion: ambassador/v1 - kind: Module - name: ambassador - config: - service_port: 8080 # Set port since the default ingress already occupies the default port - http: - port: 8080 # Set port since the default ingress already occupies the default port \ No newline at end of file +kind: Module +description: Ambassador API Gateway +type: helm +name: ambassador +chart: stable/ambassador +values: + service: + annotations: + getambassador.io/config: | + --- + apiVersion: ambassador/v1 + kind: Module + name: ambassador + config: + service_port: 8080 # Set port since the default ingress already occupies the default port + http: + port: 8080 # Set port since the default ingress already occupies the default port \ No newline at end of file diff --git a/examples/ambassador/garden.yml b/examples/ambassador/garden.yml index 4e3dd30efa..72d8b1b8ec 100644 --- a/examples/ambassador/garden.yml +++ b/examples/ambassador/garden.yml @@ -1,7 +1,7 @@ -project: - name: ambassador - environments: - - name: local - providers: - - name: local-kubernetes - setupIngressController: false +kind: Project +name: ambassador +environments: + - name: local + providers: + - name: local-kubernetes + setupIngressController: false diff --git a/examples/ambassador/go-service/garden.yml b/examples/ambassador/go-service/garden.yml index 9a9459faa5..4727d8e043 100644 --- a/examples/ambassador/go-service/garden.yml +++ b/examples/ambassador/go-service/garden.yml @@ -1,19 +1,19 @@ -module: - name: go-service - description: Go service container - type: container - services: - - name: go-service - ports: - - name: http - containerPort: 8080 - # Maps service:80 -> container:8080 - servicePort: 80 - annotations: - getambassador.io/config: | - --- - apiVersion: ambassador/v1 - kind: Mapping - name: go-service_mapping - prefix: /go-service/ - service: go-service:80 +kind: Module +name: go-service +description: Go service container +type: container +services: + - name: go-service + ports: + - name: http + containerPort: 8080 + # Maps service:80 -> container:8080 + servicePort: 80 + annotations: + getambassador.io/config: | + --- + apiVersion: ambassador/v1 + kind: Mapping + name: go-service_mapping + prefix: /go-service/ + service: go-service:80 diff --git a/examples/ambassador/node-service/garden.yml b/examples/ambassador/node-service/garden.yml index cb05ff889a..e0b002e7da 100644 --- a/examples/ambassador/node-service/garden.yml +++ b/examples/ambassador/node-service/garden.yml @@ -1,26 +1,26 @@ -module: - name: node-service - description: Node service container - type: container - services: - - name: node-service - ports: - - name: http - containerPort: 8080 - annotations: - getambassador.io/config: | - --- - apiVersion: ambassador/v1 - kind: Mapping - name: node-service_mapping - prefix: /node-service/ - service: node-service:8080 - dependencies: - - go-service - tests: - - name: unit - args: [npm, test] - - name: integ - args: [npm, run, integ] - dependencies: - - go-service +kind: Module +name: node-service +description: Node service container +type: container +services: + - name: node-service + ports: + - name: http + containerPort: 8080 + annotations: + getambassador.io/config: | + --- + apiVersion: ambassador/v1 + kind: Mapping + name: node-service_mapping + prefix: /node-service/ + service: node-service:8080 + dependencies: + - go-service +tests: + - name: unit + args: [npm, test] + - name: integ + args: [npm, run, integ] + dependencies: + - go-service diff --git a/examples/hot-reload/garden.yml b/examples/hot-reload/garden.yml index cd5a6cde44..43670ee42b 100644 --- a/examples/hot-reload/garden.yml +++ b/examples/hot-reload/garden.yml @@ -1,8 +1,5 @@ kind: Project name: hot-reload -environmentDefaults: - providers: - - name: container environments: - name: local providers: diff --git a/examples/local-tls/garden.yml b/examples/local-tls/garden.yml index b8710f823f..d18b86b5ea 100644 --- a/examples/local-tls/garden.yml +++ b/examples/local-tls/garden.yml @@ -1,12 +1,12 @@ -project: - name: local-tls - environments: - - name: local - providers: - - name: local-kubernetes - defaultHostname: garden.dev - tlsCertificates: - - name: garden-dev - secretRef: - name: tls-garden-dev - namespace: default +kind: Project +name: local-tls +environments: +- name: local + providers: + - name: local-kubernetes + defaultHostname: garden.dev + tlsCertificates: + - name: garden-dev + secretRef: + name: tls-garden-dev + namespace: default diff --git a/examples/local-tls/services/go-service/garden.yml b/examples/local-tls/services/go-service/garden.yml index 267b84216e..cbfc3b49a3 100644 --- a/examples/local-tls/services/go-service/garden.yml +++ b/examples/local-tls/services/go-service/garden.yml @@ -1,12 +1,12 @@ -module: - name: go-service - description: Go service container - type: container - services: - - name: go-service - ports: - - name: http - containerPort: 80 - ingresses: - - path: / - port: http +kind: Module +name: go-service +description: Go service container +type: container +services: + - name: go-service + ports: + - name: http + containerPort: 80 + ingresses: + - path: / + port: http diff --git a/examples/local-tls/services/node-service/garden.yml b/examples/local-tls/services/node-service/garden.yml index 07737821bd..c08e363dd0 100644 --- a/examples/local-tls/services/node-service/garden.yml +++ b/examples/local-tls/services/node-service/garden.yml @@ -1,24 +1,24 @@ -module: - name: node-service - description: Node service container - type: container - services: - - name: node-service - args: [npm, start] - ports: - - name: http - containerPort: 8080 - ingresses: - - path: /hello - port: http - - path: /call-go-service - port: http - dependencies: - - go-service - tests: - - name: unit - args: [npm, test] - - name: integ - args: [npm, run, integ] - dependencies: - - go-service +kind: Module +name: node-service +description: Node service container +type: container +services: + - name: node-service + args: [npm, start] + ports: + - name: http + containerPort: 8080 + ingresses: + - path: /hello + port: http + - path: /call-go-service + port: http + dependencies: + - go-service +tests: + - name: unit + args: [npm, test] + - name: integ + args: [npm, run, integ] + dependencies: + - go-service diff --git a/garden-service/static/garden.yml b/garden-service/static/garden.yml index d77384162d..b3fb43455b 100644 --- a/garden-service/static/garden.yml +++ b/garden-service/static/garden.yml @@ -1,12 +1,12 @@ -project: - name: garden-framework - environments: - - name: local - providers: - - name: local-kubernetes - # note: this context is not actually used for anything - context: docker-for-desktop - variables: - # these are dummy variables, only used when resolving module versions - gateway-hostname: foo - function-namespace: boo +kind: Project +name: garden-framework +environments: + - name: local + providers: + - name: local-kubernetes + # note: this context is not actually used for anything + context: docker-for-desktop + variables: + # these are dummy variables, only used when resolving module versions + gateway-hostname: foo + function-namespace: boo diff --git a/garden-service/static/kubernetes/system/default-backend/garden.yml b/garden-service/static/kubernetes/system/default-backend/garden.yml index 5ef074694b..5ad2cc30b6 100644 --- a/garden-service/static/kubernetes/system/default-backend/garden.yml +++ b/garden-service/static/kubernetes/system/default-backend/garden.yml @@ -1,10 +1,10 @@ -module: - name: default-backend - description: Default backend ingress controller - type: container - image: gardendev/default-backend:v0.1 - services: - - name: default-backend - ports: - - name: http - containerPort: 80 +kind: Module +name: default-backend +description: Default backend ingress controller +type: container +image: gardendev/default-backend:v0.1 +services: + - name: default-backend + ports: + - name: http + containerPort: 80 diff --git a/garden-service/static/kubernetes/system/ingress-controller/garden.yml b/garden-service/static/kubernetes/system/ingress-controller/garden.yml index 3aba3bfff7..4d86a5a5c3 100644 --- a/garden-service/static/kubernetes/system/ingress-controller/garden.yml +++ b/garden-service/static/kubernetes/system/ingress-controller/garden.yml @@ -1,19 +1,19 @@ -module: - description: Ingress controller for garden development +kind: Module +description: Ingress controller for garden development +name: ingress-controller +type: helm +chart: stable/nginx-ingress +releaseName: garden-nginx +dependencies: + - default-backend +version: 0.25.1 +values: name: ingress-controller - type: helm - chart: stable/nginx-ingress - releaseName: garden-nginx - dependencies: - - default-backend - version: 0.25.1 - values: - name: ingress-controller - controller: - defaultBackendService: garden-system/default-backend - kind: DaemonSet - daemonset: - useHostPort: true - minReadySeconds: 1 - defaultBackend: - enabled: false + controller: + defaultBackendService: garden-system/default-backend + kind: DaemonSet + daemonset: + useHostPort: true + minReadySeconds: 1 + defaultBackend: + enabled: false diff --git a/garden-service/static/kubernetes/system/kubernetes-dashboard/garden.yml b/garden-service/static/kubernetes/system/kubernetes-dashboard/garden.yml index 24ddc617eb..6520221653 100644 --- a/garden-service/static/kubernetes/system/kubernetes-dashboard/garden.yml +++ b/garden-service/static/kubernetes/system/kubernetes-dashboard/garden.yml @@ -1,17 +1,17 @@ -module: - description: Kubernetes dashboard configuration - name: kubernetes-dashboard - type: helm - chart: stable/kubernetes-dashboard - version: 1.2.0 - values: - fullnameOverride: kubernetes-dashboard - service: - type: NodePort - # This is only okay because it's just used for the local-kubernetes plugin. - # Don't use this config for remote clusters! - enableInsecureLogin: true - enableSkipLogin: true - # We should remove this after https://github.com/helm/charts/issues/9776 is resolved. - rbac: - clusterAdminRole: true +kind: Module +description: Kubernetes dashboard configuration +name: kubernetes-dashboard +type: helm +chart: stable/kubernetes-dashboard +version: 1.2.0 +values: + fullnameOverride: kubernetes-dashboard + service: + type: NodePort + # This is only okay because it's just used for the local-kubernetes plugin. + # Don't use this config for remote clusters! + enableInsecureLogin: true + enableSkipLogin: true + # We should remove this after https://github.com/helm/charts/issues/9776 is resolved. + rbac: + clusterAdminRole: true diff --git a/garden-service/static/local-gcf-container/garden.yml b/garden-service/static/local-gcf-container/garden.yml index b7da4ac5d2..72a2044287 100644 --- a/garden-service/static/local-gcf-container/garden.yml +++ b/garden-service/static/local-gcf-container/garden.yml @@ -1,4 +1,4 @@ -module: - description: Base container for running Google Cloud Functions emulator - type: container - name: local-gcf-container +kind: Module +description: Base container for running Google Cloud Functions emulator +type: container +name: local-gcf-container diff --git a/garden-service/test/unit/data/test-project-a/garden.yml b/garden-service/test/unit/data/test-project-a/garden.yml index bd1f17723f..bf500f176a 100644 --- a/garden-service/test/unit/data/test-project-a/garden.yml +++ b/garden-service/test/unit/data/test-project-a/garden.yml @@ -1,11 +1,10 @@ -project: - name: test-project-a - environmentDefaults: - variables: - some: variable - environments: - - name: local - providers: - - name: test-plugin - - name: test-plugin-b - - name: other +kind: Project +name: test-project-a +environments: + - name: local + providers: + - name: test-plugin + - name: test-plugin-b + - name: other +variables: + some: variable diff --git a/garden-service/test/unit/data/test-project-a/module-a/garden.yml b/garden-service/test/unit/data/test-project-a/module-a/garden.yml index 92469aba01..33c94c547e 100644 --- a/garden-service/test/unit/data/test-project-a/module-a/garden.yml +++ b/garden-service/test/unit/data/test-project-a/module-a/garden.yml @@ -1,15 +1,15 @@ -module: - name: module-a - type: test - services: - - name: service-a - build: - command: [echo, A] - tests: - - name: unit - command: [echo, OK] - - name: integration - command: [echo, OK] - tasks: - - name: task-a - command: [echo, OK] +kind: Module +name: module-a +type: test +services: + - name: service-a +build: + command: [echo, A] +tests: + - name: unit + command: [echo, OK] + - name: integration + command: [echo, OK] +tasks: + - name: task-a + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-project-a/module-b/garden.yml b/garden-service/test/unit/data/test-project-a/module-b/garden.yml index 6bd8f70222..f09543ae96 100644 --- a/garden-service/test/unit/data/test-project-a/module-b/garden.yml +++ b/garden-service/test/unit/data/test-project-a/module-b/garden.yml @@ -1,17 +1,17 @@ -module: - name: module-b - type: test - services: - - name: service-b - dependencies: - - service-a - build: - command: [echo, B] +kind: Module +name: module-b +type: test +services: + - name: service-b dependencies: - - module-a - tests: - - name: unit - command: [echo, OK] - tasks: - - name: task-b - command: [echo, OK] + - service-a +build: + command: [echo, B] + dependencies: + - module-a +tests: + - name: unit + command: [echo, OK] +tasks: + - name: task-b + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-project-a/module-c/garden.yml b/garden-service/test/unit/data/test-project-a/module-c/garden.yml index 438d8073bc..0ff5a5ca02 100644 --- a/garden-service/test/unit/data/test-project-a/module-c/garden.yml +++ b/garden-service/test/unit/data/test-project-a/module-c/garden.yml @@ -1,16 +1,16 @@ -module: - name: module-c - type: test - services: - - name: service-c - build: - dependencies: - - module-b - tests: - - name: unit - command: [echo, OK] - - name: integ - command: [echo, OK] - tasks: - - name: task-c - command: [echo, OK] +kind: Module +name: module-c +type: test +services: + - name: service-c +build: + dependencies: + - module-b +tests: + - name: unit + command: [echo, OK] + - name: integ + command: [echo, OK] +tasks: + - name: task-c + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-project-auto-reload/garden.yml b/garden-service/test/unit/data/test-project-auto-reload/garden.yml index 42864b23ab..5e9c69c960 100644 --- a/garden-service/test/unit/data/test-project-auto-reload/garden.yml +++ b/garden-service/test/unit/data/test-project-auto-reload/garden.yml @@ -1,6 +1,6 @@ -project: - name: test-project-auto-reload - environments: - - name: local - providers: - - name: test-plugin +kind: Project +name: test-project-auto-reload +environments: + - name: local + providers: + - name: test-plugin diff --git a/garden-service/test/unit/data/test-project-auto-reload/module-a/garden.yml b/garden-service/test/unit/data/test-project-auto-reload/module-a/garden.yml index 5b3a7f247f..a3fc2faa8e 100644 --- a/garden-service/test/unit/data/test-project-auto-reload/module-a/garden.yml +++ b/garden-service/test/unit/data/test-project-auto-reload/module-a/garden.yml @@ -1,14 +1,14 @@ -module: - name: module-a - type: container - image: scratch - services: - - name: service-a - ingresses: - - path: /path-b - port: http - ports: - - name: http - containerPort: 8080 - build: - command: [echo, A] +kind: Module +name: module-a +type: container +image: scratch +services: + - name: service-a + ingresses: + - path: /path-b + port: http + ports: + - name: http + containerPort: 8080 +build: + command: [echo, A] diff --git a/garden-service/test/unit/data/test-project-auto-reload/module-b/garden.yml b/garden-service/test/unit/data/test-project-auto-reload/module-b/garden.yml index 25b8606d01..40637224e9 100644 --- a/garden-service/test/unit/data/test-project-auto-reload/module-b/garden.yml +++ b/garden-service/test/unit/data/test-project-auto-reload/module-b/garden.yml @@ -1,18 +1,18 @@ -module: - name: module-b - type: container - image: scratch - services: - - name: service-b - dependencies: - - service-a - ingresses: - - path: /path-b - port: http - ports: - - name: http - containerPort: 8080 - build: - command: [echo, B] +kind: Module +name: module-b +type: container +image: scratch +services: + - name: service-b dependencies: - - module-a + - service-a + ingresses: + - path: /path-b + port: http + ports: + - name: http + containerPort: 8080 +build: + command: [echo, B] + dependencies: + - module-a diff --git a/garden-service/test/unit/data/test-project-auto-reload/module-c/garden.yml b/garden-service/test/unit/data/test-project-auto-reload/module-c/garden.yml index 29a1282aff..a70a23ac3b 100644 --- a/garden-service/test/unit/data/test-project-auto-reload/module-c/garden.yml +++ b/garden-service/test/unit/data/test-project-auto-reload/module-c/garden.yml @@ -1,14 +1,14 @@ -module: - name: module-c - type: container - image: scratch - services: - - name: service-c - ingresses: - - path: /path-c - port: http - ports: - - name: http - containerPort: 8080 - build: - command: [echo, C] +kind: Module +name: module-c +type: container +image: scratch +services: + - name: service-c + ingresses: + - path: /path-c + port: http + ports: + - name: http + containerPort: 8080 +build: + command: [echo, C] diff --git a/garden-service/test/unit/data/test-project-auto-reload/module-d/garden.yml b/garden-service/test/unit/data/test-project-auto-reload/module-d/garden.yml index fd73832f6a..213b73d713 100644 --- a/garden-service/test/unit/data/test-project-auto-reload/module-d/garden.yml +++ b/garden-service/test/unit/data/test-project-auto-reload/module-d/garden.yml @@ -1,18 +1,18 @@ -module: - name: module-d - type: container - image: scratch - services: - - name: service-d - dependencies: - - service-b - ingresses: - - path: /path-d - port: http - ports: - - name: http - containerPort: 8080 - build: - command: [echo, D] +kind: Module +name: module-d +type: container +image: scratch +services: + - name: service-d dependencies: - - module-b + - service-b + ingresses: + - path: /path-d + port: http + ports: + - name: http + containerPort: 8080 +build: + command: [echo, D] + dependencies: + - module-b diff --git a/garden-service/test/unit/data/test-project-auto-reload/module-e/garden.yml b/garden-service/test/unit/data/test-project-auto-reload/module-e/garden.yml index 63e2fb4327..8161e931bc 100644 --- a/garden-service/test/unit/data/test-project-auto-reload/module-e/garden.yml +++ b/garden-service/test/unit/data/test-project-auto-reload/module-e/garden.yml @@ -1,18 +1,18 @@ -module: - name: module-e - type: container - image: scratch - services: - - name: service-e - dependencies: - - service-c - ingresses: - - path: /path-e - port: http - ports: - - name: http - containerPort: 8080 - build: +kind: Module +name: module-e +type: container +image: scratch +services: + - name: service-e dependencies: - - module-b - command: [echo, E] + - service-c + ingresses: + - path: /path-e + port: http + ports: + - name: http + containerPort: 8080 +build: + dependencies: + - module-b + command: [echo, E] diff --git a/garden-service/test/unit/data/test-project-auto-reload/module-f/garden.yml b/garden-service/test/unit/data/test-project-auto-reload/module-f/garden.yml index 0ce6dcbe22..9c9b723a15 100644 --- a/garden-service/test/unit/data/test-project-auto-reload/module-f/garden.yml +++ b/garden-service/test/unit/data/test-project-auto-reload/module-f/garden.yml @@ -1,18 +1,18 @@ -module: - name: module-f - type: container - image: scratch - services: - - name: service-f - dependencies: - - service-c - ingresses: - - path: /path-f - port: http - ports: - - name: http - containerPort: 8080 - build: +kind: Module +name: module-f +type: container +image: scratch +services: + - name: service-f dependencies: - - module-c - command: [echo, F] + - service-c + ingresses: + - path: /path-f + port: http + ports: + - name: http + containerPort: 8080 +build: + dependencies: + - module-c + command: [echo, F] diff --git a/garden-service/test/unit/data/test-project-b/garden.yml b/garden-service/test/unit/data/test-project-b/garden.yml index 00fdd4b5b0..1f00ac4e67 100644 --- a/garden-service/test/unit/data/test-project-b/garden.yml +++ b/garden-service/test/unit/data/test-project-b/garden.yml @@ -1,8 +1,6 @@ -project: - name: test-project-b - environmentDefaults: - providers: [] - environments: - - name: local - providers: - - name: test-plugin +kind: Project +name: test-project-b +environments: + - name: local + providers: + - name: test-plugin diff --git a/garden-service/test/unit/data/test-project-b/module-a/garden.yml b/garden-service/test/unit/data/test-project-b/module-a/garden.yml index 0319075aba..72f7282cbe 100644 --- a/garden-service/test/unit/data/test-project-b/module-a/garden.yml +++ b/garden-service/test/unit/data/test-project-b/module-a/garden.yml @@ -1,21 +1,21 @@ -module: - name: module-a - type: test - services: - - name: service-a - ingresses: - - path: /path-a - port: http - ports: - - name: http - containerPort: 8080 - dependencies: - - task-a - build: +kind: Module +name: module-a +type: test +services: + - name: service-a + ingresses: + - path: /path-a + port: http + ports: + - name: http + containerPort: 8080 + dependencies: + - task-a +build: + command: [echo, A] +tasks: + - name: task-a + description: task-a-description command: [echo, A] - tasks: - - name: task-a - description: task-a-description - command: [echo, A] - dependencies: - - task-c + dependencies: + - task-c diff --git a/garden-service/test/unit/data/test-project-b/module-b/garden.yml b/garden-service/test/unit/data/test-project-b/module-b/garden.yml index 966fdd2cb5..254ae896f6 100644 --- a/garden-service/test/unit/data/test-project-b/module-b/garden.yml +++ b/garden-service/test/unit/data/test-project-b/module-b/garden.yml @@ -1,17 +1,17 @@ -module: - name: module-b - type: test - services: - - name: service-b - ingresses: - - path: /path-b - port: http - ports: - - name: http - containerPort: 8080 - dependencies: - - service-a - build: - command: [echo, B] +kind: Module +name: module-b +type: test +services: + - name: service-b + ingresses: + - path: /path-b + port: http + ports: + - name: http + containerPort: 8080 dependencies: - - module-a + - service-a +build: + command: [echo, B] + dependencies: + - module-a diff --git a/garden-service/test/unit/data/test-project-b/module-c/garden.yml b/garden-service/test/unit/data/test-project-b/module-c/garden.yml index 7b5a0014d5..0dc4486870 100644 --- a/garden-service/test/unit/data/test-project-b/module-c/garden.yml +++ b/garden-service/test/unit/data/test-project-b/module-c/garden.yml @@ -1,25 +1,25 @@ -module: - name: module-c - type: test - allowPublish: false - services: - - name: service-c - ingresses: - - path: /path-c - port: http - ports: - - name: http - containerPort: 8080 - - name: service-d - ingresses: - - path: /path-d - port: http - ports: - - name: http - containerPort: 8080 - build: - dependencies: - - module-b - tasks: - - name: task-c - command: [echo, C] +kind: Module +name: module-c +type: test +allowPublish: false +services: + - name: service-c + ingresses: + - path: /path-c + port: http + ports: + - name: http + containerPort: 8080 + - name: service-d + ingresses: + - path: /path-d + port: http + ports: + - name: http + containerPort: 8080 +build: + dependencies: + - module-b +tasks: + - name: task-c + command: [echo, C] diff --git a/garden-service/test/unit/data/test-project-build-products/garden.yml b/garden-service/test/unit/data/test-project-build-products/garden.yml index e1ecc13edb..f77891b6aa 100644 --- a/garden-service/test/unit/data/test-project-build-products/garden.yml +++ b/garden-service/test/unit/data/test-project-build-products/garden.yml @@ -1,6 +1,6 @@ -project: - name: build-products - environments: - - name: local - providers: - - name: test-plugin +kind: Project +name: build-products +environments: + - name: local + providers: + - name: test-plugin diff --git a/garden-service/test/unit/data/test-project-build-products/module-a/garden.yml b/garden-service/test/unit/data/test-project-build-products/module-a/garden.yml index 2d8cfab046..a96a1d5571 100644 --- a/garden-service/test/unit/data/test-project-build-products/module-a/garden.yml +++ b/garden-service/test/unit/data/test-project-build-products/module-a/garden.yml @@ -1,5 +1,5 @@ -module: - name: module-a - type: test - build: - command: [echo, A, "&&", touch, a.txt] +kind: Module +name: module-a +type: test +build: + command: [echo, A, "&&", touch, a.txt] diff --git a/garden-service/test/unit/data/test-project-build-products/module-b/garden.yml b/garden-service/test/unit/data/test-project-build-products/module-b/garden.yml index 8414f24441..6a258553de 100644 --- a/garden-service/test/unit/data/test-project-build-products/module-b/garden.yml +++ b/garden-service/test/unit/data/test-project-build-products/module-b/garden.yml @@ -1,11 +1,11 @@ -module: - name: module-b - type: test - build: - command: [ - echo, B, - "&&", - mkdir, -p, build/build_subdir, - "&&", - touch, build/b1.txt, build/build_subdir/b2.txt, build/unused.txt - ] +kind: Module +name: module-b +type: test +build: + command: [ + echo, B, + "&&", + mkdir, -p, build/build_subdir, + "&&", + touch, build/b1.txt, build/build_subdir/b2.txt, build/unused.txt + ] diff --git a/garden-service/test/unit/data/test-project-build-products/module-c/garden.yml b/garden-service/test/unit/data/test-project-build-products/module-c/garden.yml index d6d8f40832..7a17c893aa 100644 --- a/garden-service/test/unit/data/test-project-build-products/module-c/garden.yml +++ b/garden-service/test/unit/data/test-project-build-products/module-c/garden.yml @@ -1,5 +1,5 @@ -module: - name: module-c - type: test - build: - command: [echo, C] +kind: Module +name: module-c +type: test +build: + command: [echo, C] diff --git a/garden-service/test/unit/data/test-project-build-products/module-d/garden.yml b/garden-service/test/unit/data/test-project-build-products/module-d/garden.yml index 13d16047c5..35747e09d8 100644 --- a/garden-service/test/unit/data/test-project-build-products/module-d/garden.yml +++ b/garden-service/test/unit/data/test-project-build-products/module-d/garden.yml @@ -1,22 +1,22 @@ -module: - name: module-d - type: test - build: - command: [ - echo, D, - "&&", - mkdir, -p, build, - "&&", - touch, build/d.txt - ] - dependencies: - - name: module-a - copy: - - source: a.txt - target: a/ - - name: module-b - copy: - - source: build/b1.txt - target: b/build/ - - source: build/build_subdir/ - target: b/build_subdir +kind: Module +name: module-d +type: test +build: + command: [ + echo, D, + "&&", + mkdir, -p, build, + "&&", + touch, build/d.txt + ] + dependencies: + - name: module-a + copy: + - source: a.txt + target: a/ + - name: module-b + copy: + - source: build/b1.txt + target: b/build/ + - source: build/build_subdir/ + target: b/build_subdir diff --git a/garden-service/test/unit/data/test-project-build-products/module-e/garden.yml b/garden-service/test/unit/data/test-project-build-products/module-e/garden.yml index a156745002..bca0fc767b 100644 --- a/garden-service/test/unit/data/test-project-build-products/module-e/garden.yml +++ b/garden-service/test/unit/data/test-project-build-products/module-e/garden.yml @@ -1,10 +1,10 @@ -module: - name: module-e - type: test - build: - command: [echo, E] - dependencies: - - name: module-d - copy: - - source: build/d.txt - target: d/build/ +kind: Module +name: module-e +type: test +build: + command: [echo, E] + dependencies: + - name: module-d + copy: + - source: build/d.txt + target: d/build/ diff --git a/garden-service/test/unit/data/test-project-circular-deps/garden.yml b/garden-service/test/unit/data/test-project-circular-deps/garden.yml index fc289ee552..1f00ac4e67 100644 --- a/garden-service/test/unit/data/test-project-circular-deps/garden.yml +++ b/garden-service/test/unit/data/test-project-circular-deps/garden.yml @@ -1,6 +1,6 @@ -project: - name: test-project-b - environments: - - name: local - providers: - - name: test-plugin +kind: Project +name: test-project-b +environments: + - name: local + providers: + - name: test-plugin diff --git a/garden-service/test/unit/data/test-project-circular-deps/module-a/garden.yml b/garden-service/test/unit/data/test-project-circular-deps/module-a/garden.yml index 5ea1d0fce1..5b86a5ae50 100644 --- a/garden-service/test/unit/data/test-project-circular-deps/module-a/garden.yml +++ b/garden-service/test/unit/data/test-project-circular-deps/module-a/garden.yml @@ -1,11 +1,11 @@ -module: - name: module-a - type: test - services: - - name: service-a - dependencies: - - service-c - build: - command: [echo, A] +kind: Module +name: module-a +type: test +services: + - name: service-a dependencies: - - module-c + - service-c +build: + command: [echo, A] + dependencies: + - module-c diff --git a/garden-service/test/unit/data/test-project-circular-deps/module-b/garden.yml b/garden-service/test/unit/data/test-project-circular-deps/module-b/garden.yml index 9fcdd72efb..541f117032 100644 --- a/garden-service/test/unit/data/test-project-circular-deps/module-b/garden.yml +++ b/garden-service/test/unit/data/test-project-circular-deps/module-b/garden.yml @@ -1,12 +1,12 @@ -module: - name: module-b - type: test - services: - - name: service-b - dependencies: - - service-a - - service-c - build: - command: [echo, B] +kind: Module +name: module-b +type: test +services: + - name: service-b dependencies: - - module-a + - service-a + - service-c +build: + command: [echo, B] + dependencies: + - module-a diff --git a/garden-service/test/unit/data/test-project-circular-deps/module-c/garden.yml b/garden-service/test/unit/data/test-project-circular-deps/module-c/garden.yml index 1b3f3a913d..46abe33cb2 100644 --- a/garden-service/test/unit/data/test-project-circular-deps/module-c/garden.yml +++ b/garden-service/test/unit/data/test-project-circular-deps/module-c/garden.yml @@ -1,11 +1,11 @@ -module: - name: module-c - type: test - allowPublish: false - services: - - name: service-c - dependencies: - - service-b - build: +kind: Module +name: module-c +type: test +allowPublish: false +services: + - name: service-c dependencies: - - module-b + - service-b +build: + dependencies: + - module-b diff --git a/garden-service/test/unit/data/test-project-container/garden.yml b/garden-service/test/unit/data/test-project-container/garden.yml index 080a65d87a..02499a3993 100644 --- a/garden-service/test/unit/data/test-project-container/garden.yml +++ b/garden-service/test/unit/data/test-project-container/garden.yml @@ -1,6 +1,6 @@ -project: - name: container-module-test-project - environments: - - name: local - providers: - - name: test-plugin +kind: Project +name: container-module-test-project +environments: + - name: local + providers: + - name: test-plugin diff --git a/garden-service/test/unit/data/test-project-container/module-a/garden.yml b/garden-service/test/unit/data/test-project-container/module-a/garden.yml index 09faaa1709..6ca078dd1d 100644 --- a/garden-service/test/unit/data/test-project-container/module-a/garden.yml +++ b/garden-service/test/unit/data/test-project-container/module-a/garden.yml @@ -1,16 +1,16 @@ -module: - name: module-a - type: container - services: - - name: service-a - ports: - - name: http - containerPort: 8080 - ingresses: - - path: / - port: http - healthCheck: - tcpPort: http - tasks: - - name: task-a - args: [echo, A] +kind: Module +name: module-a +type: container +services: + - name: service-a + ports: + - name: http + containerPort: 8080 + ingresses: + - path: / + port: http + healthCheck: + tcpPort: http +tasks: + - name: task-a + args: [echo, A] diff --git a/garden-service/test/unit/data/test-project-dependants/build-dependant/garden.yml b/garden-service/test/unit/data/test-project-dependants/build-dependant/garden.yml index b7344ac90b..93d43b1700 100644 --- a/garden-service/test/unit/data/test-project-dependants/build-dependant/garden.yml +++ b/garden-service/test/unit/data/test-project-dependants/build-dependant/garden.yml @@ -1,15 +1,15 @@ -module: - description: Build dependant - name: build-dependant - type: test - services: - - name: build-dependant - ports: - - name: http - containerPort: 8080 - ingresses: - - path: /dependant - port: http - build: - dependencies: - - good-morning +kind: Module +description: Build dependant +name: build-dependant +type: test +services: + - name: build-dependant + ports: + - name: http + containerPort: 8080 + ingresses: + - path: /dependant + port: http +build: + dependencies: + - good-morning diff --git a/garden-service/test/unit/data/test-project-dependants/build-dependency/garden.yml b/garden-service/test/unit/data/test-project-dependants/build-dependency/garden.yml index 36545b9d55..b3230cc4d7 100644 --- a/garden-service/test/unit/data/test-project-dependants/build-dependency/garden.yml +++ b/garden-service/test/unit/data/test-project-dependants/build-dependency/garden.yml @@ -1,12 +1,12 @@ -module: - description: Build dependency - name: build-dependency - type: test - services: - - name: build-dependency - ports: - - name: http - containerPort: 8080 - ingresses: - - path: /dependency - port: http +kind: Module +description: Build dependency +name: build-dependency +type: test +services: + - name: build-dependency + ports: + - name: http + containerPort: 8080 + ingresses: + - path: /dependency + port: http diff --git a/garden-service/test/unit/data/test-project-dependants/garden.yml b/garden-service/test/unit/data/test-project-dependants/garden.yml index 6f10744dc8..95289e1634 100644 --- a/garden-service/test/unit/data/test-project-dependants/garden.yml +++ b/garden-service/test/unit/data/test-project-dependants/garden.yml @@ -1,8 +1,6 @@ -project: - name: test-project-dependants - environmentDefaults: - providers: [] - environments: - - name: local - providers: - - name: test-plugin +kind: Project +name: test-project-dependants +environments: + - name: local + providers: + - name: test-plugin diff --git a/garden-service/test/unit/data/test-project-dependants/good-evening/garden.yml b/garden-service/test/unit/data/test-project-dependants/good-evening/garden.yml index f27ef619bb..2d816a21ea 100644 --- a/garden-service/test/unit/data/test-project-dependants/good-evening/garden.yml +++ b/garden-service/test/unit/data/test-project-dependants/good-evening/garden.yml @@ -1,12 +1,12 @@ -module: - description: Good evening greeting service - name: good-evening - type: test - services: - - name: good-evening - ports: - - name: http - containerPort: 8080 - ingresses: - - path: /evening - port: http +kind: Module +description: Good evening greeting service +name: good-evening +type: test +services: + - name: good-evening + ports: + - name: http + containerPort: 8080 + ingresses: + - path: /evening + port: http diff --git a/garden-service/test/unit/data/test-project-dependants/good-morning/garden.yml b/garden-service/test/unit/data/test-project-dependants/good-morning/garden.yml index 36a158a756..8aed6e4fad 100644 --- a/garden-service/test/unit/data/test-project-dependants/good-morning/garden.yml +++ b/garden-service/test/unit/data/test-project-dependants/good-morning/garden.yml @@ -1,20 +1,20 @@ -module: - description: Good morning greeting service - name: good-morning - type: test - services: - - name: good-morning - ports: - - name: http - containerPort: 8080 - ingresses: - - path: /morning - port: http - dependencies: - - good-morning-task - build: +kind: Module +description: Good morning greeting service +name: good-morning +type: test +services: + - name: good-morning + ports: + - name: http + containerPort: 8080 + ingresses: + - path: /morning + port: http dependencies: - - build-dependency - tasks: - - name: good-morning-task - command: [echo, good-morning-task] + - good-morning-task +build: + dependencies: + - build-dependency +tasks: + - name: good-morning-task + command: [echo, good-morning-task] diff --git a/garden-service/test/unit/data/test-project-dependants/service-dependant/garden.yml b/garden-service/test/unit/data/test-project-dependants/service-dependant/garden.yml index a9c01d238c..586e028401 100644 --- a/garden-service/test/unit/data/test-project-dependants/service-dependant/garden.yml +++ b/garden-service/test/unit/data/test-project-dependants/service-dependant/garden.yml @@ -1,20 +1,20 @@ -module: - description: Service dependant - name: service-dependant - type: test - services: - - name: service-dependant - ports: - - name: http - containerPort: 8080 - ingresses: - - path: /dependant - port: http - dependencies: - - good-morning - # - dependant-task - tasks: - - name: dependant-task - command: [echo, dependant-task] - dependencies: - - service-dependant +kind: Module +description: Service dependant +name: service-dependant +type: test +services: + - name: service-dependant + ports: + - name: http + containerPort: 8080 + ingresses: + - path: /dependant + port: http + dependencies: + - good-morning + # - dependant-task +tasks: + - name: dependant-task + command: [echo, dependant-task] + dependencies: + - service-dependant diff --git a/garden-service/test/unit/data/test-project-dependants/service-dependant2/garden.yml b/garden-service/test/unit/data/test-project-dependants/service-dependant2/garden.yml index 16d952f22d..3e75b7344b 100644 --- a/garden-service/test/unit/data/test-project-dependants/service-dependant2/garden.yml +++ b/garden-service/test/unit/data/test-project-dependants/service-dependant2/garden.yml @@ -1,19 +1,19 @@ -module: - description: Service dependant 2 - name: service-dependant2 - type: test - services: - - name: service-dependant2 - ports: - - name: http - containerPort: 8080 - ingresses: - - path: /dependant - port: http - dependencies: - - good-morning - tasks: - - name: dependant-task2 - command: [echo, dependant-task2] - dependencies: - - service-dependant2 +kind: Module +description: Service dependant 2 +name: service-dependant2 +type: test +services: + - name: service-dependant2 + ports: + - name: http + containerPort: 8080 + ingresses: + - path: /dependant + port: http + dependencies: + - good-morning +tasks: + - name: dependant-task2 + command: [echo, dependant-task2] + dependencies: + - service-dependant2 diff --git a/garden-service/test/unit/data/test-project-duplicate-project-config/garden.yml b/garden-service/test/unit/data/test-project-duplicate-project-config/garden.yml index 075bcbf27a..9c0788e680 100644 --- a/garden-service/test/unit/data/test-project-duplicate-project-config/garden.yml +++ b/garden-service/test/unit/data/test-project-duplicate-project-config/garden.yml @@ -1,22 +1,18 @@ -project: - name: test-project - environmentDefaults: - variables: - some: variable - environments: - - name: local - providers: - - name: test-plugin - - name: test-plugin-b - - name: other +kind: Project +name: test-project +environments: + - name: local + providers: + - name: test-plugin + - name: test-plugin-b + - name: other +variables: + some: variable --- project: name: test-project-duplicate - environmentDefaults: - variables: - some: variable environments: - name: local providers: diff --git a/garden-service/test/unit/data/test-project-duplicate-yaml-file-extensions/garden.yaml b/garden-service/test/unit/data/test-project-duplicate-yaml-file-extensions/garden.yaml index bd1f17723f..bf500f176a 100644 --- a/garden-service/test/unit/data/test-project-duplicate-yaml-file-extensions/garden.yaml +++ b/garden-service/test/unit/data/test-project-duplicate-yaml-file-extensions/garden.yaml @@ -1,11 +1,10 @@ -project: - name: test-project-a - environmentDefaults: - variables: - some: variable - environments: - - name: local - providers: - - name: test-plugin - - name: test-plugin-b - - name: other +kind: Project +name: test-project-a +environments: + - name: local + providers: + - name: test-plugin + - name: test-plugin-b + - name: other +variables: + some: variable diff --git a/garden-service/test/unit/data/test-project-duplicate-yaml-file-extensions/garden.yml b/garden-service/test/unit/data/test-project-duplicate-yaml-file-extensions/garden.yml index bd1f17723f..bf500f176a 100644 --- a/garden-service/test/unit/data/test-project-duplicate-yaml-file-extensions/garden.yml +++ b/garden-service/test/unit/data/test-project-duplicate-yaml-file-extensions/garden.yml @@ -1,11 +1,10 @@ -project: - name: test-project-a - environmentDefaults: - variables: - some: variable - environments: - - name: local - providers: - - name: test-plugin - - name: test-plugin-b - - name: other +kind: Project +name: test-project-a +environments: + - name: local + providers: + - name: test-plugin + - name: test-plugin-b + - name: other +variables: + some: variable diff --git a/garden-service/test/unit/data/test-project-empty/garden.yml b/garden-service/test/unit/data/test-project-empty/garden.yml index 7b74ff4474..4948126fc0 100644 --- a/garden-service/test/unit/data/test-project-empty/garden.yml +++ b/garden-service/test/unit/data/test-project-empty/garden.yml @@ -1,6 +1,6 @@ -project: - name: test-project-empty - environments: - - name: local - providers: - - name: test-plugin +kind: Project +name: test-project-empty +environments: + - name: local + providers: + - name: test-plugin diff --git a/garden-service/test/unit/data/test-project-exec/garden.yml b/garden-service/test/unit/data/test-project-exec/garden.yml index bd1f17723f..bf500f176a 100644 --- a/garden-service/test/unit/data/test-project-exec/garden.yml +++ b/garden-service/test/unit/data/test-project-exec/garden.yml @@ -1,11 +1,10 @@ -project: - name: test-project-a - environmentDefaults: - variables: - some: variable - environments: - - name: local - providers: - - name: test-plugin - - name: test-plugin-b - - name: other +kind: Project +name: test-project-a +environments: + - name: local + providers: + - name: test-plugin + - name: test-plugin-b + - name: other +variables: + some: variable diff --git a/garden-service/test/unit/data/test-project-exec/module-a/garden.yml b/garden-service/test/unit/data/test-project-exec/module-a/garden.yml index e791c793e5..40a871fe1a 100644 --- a/garden-service/test/unit/data/test-project-exec/module-a/garden.yml +++ b/garden-service/test/unit/data/test-project-exec/module-a/garden.yml @@ -1,17 +1,17 @@ -module: - name: module-a - type: exec - build: - command: [echo, A] - tasks: - - name: banana - command: [echo, BANANA] - dependencies: [orange] - - name: orange - command: [echo, ORANGE] - timeout: 999 - tests: - - name: unit - command: [echo, OK] - env: - FOO: boo +kind: Module +name: module-a +type: exec +build: + command: [echo, A] +tasks: + - name: banana + command: [echo, BANANA] + dependencies: [orange] + - name: orange + command: [echo, ORANGE] + timeout: 999 +tests: + - name: unit + command: [echo, OK] + env: + FOO: boo diff --git a/garden-service/test/unit/data/test-project-exec/module-b/garden.yml b/garden-service/test/unit/data/test-project-exec/module-b/garden.yml index 0b3ea0054a..6d789c381b 100644 --- a/garden-service/test/unit/data/test-project-exec/module-b/garden.yml +++ b/garden-service/test/unit/data/test-project-exec/module-b/garden.yml @@ -1,10 +1,10 @@ -module: - name: module-b - type: exec - build: - command: [echo, B] - dependencies: - - module-a - tests: - - name: unit - command: [echo, OK] +kind: Module +name: module-b +type: exec +build: + command: [echo, B] + dependencies: + - module-a +tests: + - name: unit + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-project-exec/module-c/garden.yml b/garden-service/test/unit/data/test-project-exec/module-c/garden.yml index eb56c484fd..3ee2b1d8ff 100644 --- a/garden-service/test/unit/data/test-project-exec/module-c/garden.yml +++ b/garden-service/test/unit/data/test-project-exec/module-c/garden.yml @@ -1,9 +1,9 @@ -module: - name: module-c - type: exec - build: - dependencies: - - module-b - tests: - - name: unit - command: [echo, OK] +kind: Module +name: module-c +type: exec +build: + dependencies: + - module-b +tests: + - name: unit + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-project-ext-module-sources/module-b/garden.yml b/garden-service/test/unit/data/test-project-ext-module-sources/module-b/garden.yml index 605627eaed..a5d90728bc 100644 --- a/garden-service/test/unit/data/test-project-ext-module-sources/module-b/garden.yml +++ b/garden-service/test/unit/data/test-project-ext-module-sources/module-b/garden.yml @@ -1,11 +1,11 @@ -module: - name: module-b - repositoryUrl: https://my-git-server.com/my-repo.git#master - type: test - services: - - name: service-b - build: - command: [echo, A] - tests: - - name: unit - command: [echo, OK] +kind: Module +name: module-b +repositoryUrl: https://my-git-server.com/my-repo.git#master +type: test +services: + - name: service-b +build: + command: [echo, A] +tests: + - name: unit + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-project-ext-module-sources/module-c/garden.yml b/garden-service/test/unit/data/test-project-ext-module-sources/module-c/garden.yml index 40ed3a37f2..318d3e1c3e 100644 --- a/garden-service/test/unit/data/test-project-ext-module-sources/module-c/garden.yml +++ b/garden-service/test/unit/data/test-project-ext-module-sources/module-c/garden.yml @@ -1,11 +1,11 @@ -module: - name: module-c - repositoryUrl: https://my-git-server.com/my-repo.git#master - type: test - services: - - name: service-c - build: - command: [echo, A] - tests: - - name: unit - command: [echo, OK] \ No newline at end of file +kind: Module +name: module-c +repositoryUrl: https://my-git-server.com/my-repo.git#master +type: test +services: + - name: service-c +build: + command: [echo, A] +tests: + - name: unit + command: [echo, OK] \ No newline at end of file diff --git a/garden-service/test/unit/data/test-project-ext-project-sources/garden.yml b/garden-service/test/unit/data/test-project-ext-project-sources/garden.yml index 4384cf3555..e11ccb5dba 100644 --- a/garden-service/test/unit/data/test-project-ext-project-sources/garden.yml +++ b/garden-service/test/unit/data/test-project-ext-project-sources/garden.yml @@ -1,18 +1,17 @@ -project: - name: test-project-ext-project-sources - sources: - - name: source-a - repositoryUrl: https://my-git-server.com/my-repo.git#master - - name: source-b - repositoryUrl: https://my-git-server.com/my-repo.git#master - - name: source-c - repositoryUrl: https://my-git-server.com/my-repo.git#master - environmentDefaults: - variables: - some: variable - environments: - - name: local - providers: - - name: test-plugin - - name: test-plugin-b - - name: other +kind: Project +name: test-project-ext-project-sources +sources: + - name: source-a + repositoryUrl: https://my-git-server.com/my-repo.git#master + - name: source-b + repositoryUrl: https://my-git-server.com/my-repo.git#master + - name: source-c + repositoryUrl: https://my-git-server.com/my-repo.git#master +environments: + - name: local + providers: + - name: test-plugin + - name: test-plugin-b + - name: other +variables: + some: variable diff --git a/garden-service/test/unit/data/test-project-flat-config/garden.yml b/garden-service/test/unit/data/test-project-flat-config/garden.yml index acb8753c39..93d5523938 100644 --- a/garden-service/test/unit/data/test-project-flat-config/garden.yml +++ b/garden-service/test/unit/data/test-project-flat-config/garden.yml @@ -1,14 +1,13 @@ kind: Project name: test-project-flat-config -environmentDefaults: - variables: - some: variable environments: - name: local providers: - name: test-plugin - name: test-plugin-b - name: other +variables: + some: variable --- diff --git a/garden-service/test/unit/data/test-project-invalid-config/garden.yml b/garden-service/test/unit/data/test-project-invalid-config/garden.yml index cb1b2ec4a2..498fcc262b 100644 --- a/garden-service/test/unit/data/test-project-invalid-config/garden.yml +++ b/garden-service/test/unit/data/test-project-invalid-config/garden.yml @@ -1,6 +1,6 @@ -project: - name: test-project-invalid-config - environments: - - name: local - providers: - - name: test-plugin +kind: Project +name: test-project-invalid-config +environments: + - name: local + providers: + - name: test-plugin diff --git a/garden-service/test/unit/data/test-project-local-module-sources/module-a/garden.yml b/garden-service/test/unit/data/test-project-local-module-sources/module-a/garden.yml index e1d3a70ed8..ad586595bd 100644 --- a/garden-service/test/unit/data/test-project-local-module-sources/module-a/garden.yml +++ b/garden-service/test/unit/data/test-project-local-module-sources/module-a/garden.yml @@ -1,10 +1,10 @@ -module: - name: module-a - type: test - services: - - name: service-a - build: - command: [echo, A] - tests: - - name: unit - command: [echo, OK] +kind: Module +name: module-a +type: test +services: + - name: service-a +build: + command: [echo, A] +tests: + - name: unit + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-project-local-module-sources/module-b/garden.yml b/garden-service/test/unit/data/test-project-local-module-sources/module-b/garden.yml index f9a06fdcb4..545425ca87 100644 --- a/garden-service/test/unit/data/test-project-local-module-sources/module-b/garden.yml +++ b/garden-service/test/unit/data/test-project-local-module-sources/module-b/garden.yml @@ -1,10 +1,10 @@ -module: - name: module-b - type: test - services: - - name: service-b - build: - command: [echo, A] - tests: - - name: unit - command: [echo, OK] +kind: Module +name: module-b +type: test +services: + - name: service-b +build: + command: [echo, A] +tests: + - name: unit + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-project-local-project-sources/source-a/module-a/garden.yml b/garden-service/test/unit/data/test-project-local-project-sources/source-a/module-a/garden.yml index e1d3a70ed8..ad586595bd 100644 --- a/garden-service/test/unit/data/test-project-local-project-sources/source-a/module-a/garden.yml +++ b/garden-service/test/unit/data/test-project-local-project-sources/source-a/module-a/garden.yml @@ -1,10 +1,10 @@ -module: - name: module-a - type: test - services: - - name: service-a - build: - command: [echo, A] - tests: - - name: unit - command: [echo, OK] +kind: Module +name: module-a +type: test +services: + - name: service-a +build: + command: [echo, A] +tests: + - name: unit + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-project-local-project-sources/source-b/module-b/garden.yml b/garden-service/test/unit/data/test-project-local-project-sources/source-b/module-b/garden.yml index f9a06fdcb4..545425ca87 100644 --- a/garden-service/test/unit/data/test-project-local-project-sources/source-b/module-b/garden.yml +++ b/garden-service/test/unit/data/test-project-local-project-sources/source-b/module-b/garden.yml @@ -1,10 +1,10 @@ -module: - name: module-b - type: test - services: - - name: service-b - build: - command: [echo, A] - tests: - - name: unit - command: [echo, OK] +kind: Module +name: module-b +type: test +services: + - name: service-b +build: + command: [echo, A] +tests: + - name: unit + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-project-local-project-sources/source-c/module-c/garden.yml b/garden-service/test/unit/data/test-project-local-project-sources/source-c/module-c/garden.yml index e6fe7199f9..981459be53 100644 --- a/garden-service/test/unit/data/test-project-local-project-sources/source-c/module-c/garden.yml +++ b/garden-service/test/unit/data/test-project-local-project-sources/source-c/module-c/garden.yml @@ -1,10 +1,10 @@ -module: - name: module-c - type: test - services: - - name: service-c - build: - command: [echo, A] - tests: - - name: unit - command: [echo, OK] +kind: Module +name: module-c +type: test +services: + - name: service-c +build: + command: [echo, A] +tests: + - name: unit + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-project-missing-provider/garden.yml b/garden-service/test/unit/data/test-project-missing-provider/garden.yml index 5e5576b329..d8e417514d 100644 --- a/garden-service/test/unit/data/test-project-missing-provider/garden.yml +++ b/garden-service/test/unit/data/test-project-missing-provider/garden.yml @@ -1,7 +1,7 @@ -project: - name: build-test-project - environments: - - name: test - providers: - - name: test-plugin - - name: test-plugin-b +kind: Project +name: build-test-project +environments: + - name: test + providers: + - name: test-plugin + - name: test-plugin-b diff --git a/garden-service/test/unit/data/test-project-templated/garden.yml b/garden-service/test/unit/data/test-project-templated/garden.yml index c8c39521f5..3e190e2960 100644 --- a/garden-service/test/unit/data/test-project-templated/garden.yml +++ b/garden-service/test/unit/data/test-project-templated/garden.yml @@ -1,10 +1,9 @@ -project: - name: test-project-templated - environmentDefaults: - variables: - some: ${local.env.TEST_VARIABLE} - service-a-build-command: OK - environments: - - name: local - providers: - - name: test-plugin +kind: Project +name: test-project-templated +environments: + - name: local + providers: + - name: test-plugin +variables: + some: ${local.env.TEST_VARIABLE} + service-a-build-command: OK diff --git a/garden-service/test/unit/data/test-project-templated/module-a/garden.yml b/garden-service/test/unit/data/test-project-templated/module-a/garden.yml index 17ad53c6bc..b10fdf54ba 100644 --- a/garden-service/test/unit/data/test-project-templated/module-a/garden.yml +++ b/garden-service/test/unit/data/test-project-templated/module-a/garden.yml @@ -1,11 +1,11 @@ -module: - name: module-a - type: test - services: - - name: service-a - command: [echo, "${local.env.TEST_VARIABLE}"] - build: - command: [echo, "${var.service-a-build-command}"] - tests: - - name: unit - command: [echo, OK] +kind: Module +name: module-a +type: test +services: + - name: service-a + command: [echo, "${local.env.TEST_VARIABLE}"] +build: + command: [echo, "${var.service-a-build-command}"] +tests: + - name: unit + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-project-templated/module-b/garden.yml b/garden-service/test/unit/data/test-project-templated/module-b/garden.yml index 03d859a441..8684cab7bb 100644 --- a/garden-service/test/unit/data/test-project-templated/module-b/garden.yml +++ b/garden-service/test/unit/data/test-project-templated/module-b/garden.yml @@ -1,13 +1,13 @@ -module: - name: module-b - type: test - services: - - name: service-b - command: [echo, "${modules.module-a.version}"] - dependencies: - - service-a - build: - command: [echo, "${var.service-a-build-command}"] - tests: - - name: unit - command: [echo, OK] +kind: Module +name: module-b +type: test +services: + - name: service-b + command: [echo, "${modules.module-a.version}"] + dependencies: + - service-a +build: + command: [echo, "${var.service-a-build-command}"] +tests: + - name: unit + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-project-test-deps/garden.yml b/garden-service/test/unit/data/test-project-test-deps/garden.yml index 8889da146b..71caf09d6a 100644 --- a/garden-service/test/unit/data/test-project-test-deps/garden.yml +++ b/garden-service/test/unit/data/test-project-test-deps/garden.yml @@ -1,6 +1,6 @@ -project: - name: test-project-test-deps - environments: - - name: local - providers: - - name: test-plugin +kind: Project +name: test-project-test-deps +environments: + - name: local + providers: + - name: test-plugin diff --git a/garden-service/test/unit/data/test-project-test-deps/module-a/garden.yml b/garden-service/test/unit/data/test-project-test-deps/module-a/garden.yml index bfacb8c5d4..45271bef3a 100644 --- a/garden-service/test/unit/data/test-project-test-deps/module-a/garden.yml +++ b/garden-service/test/unit/data/test-project-test-deps/module-a/garden.yml @@ -1,15 +1,15 @@ -module: - name: module-a - type: test - services: - - name: service-a - command: [echo, OK] - tasks: - - name: task-a - command: [echo, OK] - tests: - - name: integ - dependencies: - - service-b - - task-a - command: [echo, OK] +kind: Module +name: module-a +type: test +services: + - name: service-a + command: [echo, OK] +tasks: + - name: task-a + command: [echo, OK] +tests: + - name: integ + dependencies: + - service-b + - task-a + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-project-test-deps/module-b/garden.yml b/garden-service/test/unit/data/test-project-test-deps/module-b/garden.yml index 424c88f015..5aecf904c8 100644 --- a/garden-service/test/unit/data/test-project-test-deps/module-b/garden.yml +++ b/garden-service/test/unit/data/test-project-test-deps/module-b/garden.yml @@ -1,6 +1,6 @@ -module: - name: module-b - type: test - services: - - name: service-b - command: [echo, OK] +kind: Module +name: module-b +type: test +services: + - name: service-b + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-project-variable-versioning/garden.yml b/garden-service/test/unit/data/test-project-variable-versioning/garden.yml index 2498d72baf..ccb3905b6e 100644 --- a/garden-service/test/unit/data/test-project-variable-versioning/garden.yml +++ b/garden-service/test/unit/data/test-project-variable-versioning/garden.yml @@ -1,9 +1,8 @@ -project: - name: test-project-variable-versioning - environmentDefaults: - variables: - echo-string: OK - environments: - - name: local - providers: - - name: test-plugin +kind: Project +name: test-project-variable-versioning +environments: + - name: local + providers: + - name: test-plugin +variables: + echo-string: OK diff --git a/garden-service/test/unit/data/test-project-variable-versioning/module-a/garden.yml b/garden-service/test/unit/data/test-project-variable-versioning/module-a/garden.yml index 101ec2b5fb..e48cf4cd4b 100644 --- a/garden-service/test/unit/data/test-project-variable-versioning/module-a/garden.yml +++ b/garden-service/test/unit/data/test-project-variable-versioning/module-a/garden.yml @@ -1,8 +1,8 @@ -module: - name: module-a - type: test - build: - command: [echo, "${var.echo-string}"] - tests: - - name: unit - command: [echo, OK] +kind: Module +name: module-a +type: test +build: + command: [echo, "${var.echo-string}"] +tests: + - name: unit + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-project-variable-versioning/module-b/garden.yml b/garden-service/test/unit/data/test-project-variable-versioning/module-b/garden.yml index 35cdb69f72..b7939ae3fc 100644 --- a/garden-service/test/unit/data/test-project-variable-versioning/module-b/garden.yml +++ b/garden-service/test/unit/data/test-project-variable-versioning/module-b/garden.yml @@ -1,8 +1,8 @@ -module: - name: module-b - type: test - build: - command: [echo, beans] - tests: - - name: unit - command: [echo, OK] +kind: Module +name: module-b +type: test +build: + command: [echo, beans] +tests: + - name: unit + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-project-watch/double-module/garden.yml b/garden-service/test/unit/data/test-project-watch/double-module/garden.yml index 636f933ae6..1b5e2d2982 100644 --- a/garden-service/test/unit/data/test-project-watch/double-module/garden.yml +++ b/garden-service/test/unit/data/test-project-watch/double-module/garden.yml @@ -1,29 +1,29 @@ -module: - name: module-b - type: test - services: - - name: service-b - build: - command: [echo, B] - tests: - - name: unit - command: [echo, OK] - tasks: - - name: task-b - command: [echo, OK] +kind: Module +name: module-b +type: test +services: + - name: service-b +build: + command: [echo, B] +tests: + - name: unit + command: [echo, OK] +tasks: + - name: task-b + command: [echo, OK] --- -module: - name: module-c - type: test - services: - - name: service-c - build: - command: [echo, C] - tests: - - name: unit - command: [echo, OK] - tasks: - - name: task-c - command: [echo, OK] +kind: Module +name: module-c +type: test +services: + - name: service-c +build: + command: [echo, C] +tests: + - name: unit + command: [echo, OK] +tasks: + - name: task-c + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-project-watch/garden.yml b/garden-service/test/unit/data/test-project-watch/garden.yml index bd1f17723f..bf500f176a 100644 --- a/garden-service/test/unit/data/test-project-watch/garden.yml +++ b/garden-service/test/unit/data/test-project-watch/garden.yml @@ -1,11 +1,10 @@ -project: - name: test-project-a - environmentDefaults: - variables: - some: variable - environments: - - name: local - providers: - - name: test-plugin - - name: test-plugin-b - - name: other +kind: Project +name: test-project-a +environments: + - name: local + providers: + - name: test-plugin + - name: test-plugin-b + - name: other +variables: + some: variable diff --git a/garden-service/test/unit/data/test-project-watch/module-a/garden.yml b/garden-service/test/unit/data/test-project-watch/module-a/garden.yml index 5ca3f64a6b..c16e48e508 100644 --- a/garden-service/test/unit/data/test-project-watch/module-a/garden.yml +++ b/garden-service/test/unit/data/test-project-watch/module-a/garden.yml @@ -1,13 +1,13 @@ -module: - name: module-a - type: test - services: - - name: service-a - build: - command: [echo, A] - tests: - - name: unit - command: [echo, OK] - tasks: - - name: task-a - command: [echo, OK] +kind: Module +name: module-a +type: test +services: + - name: service-a +build: + command: [echo, A] +tests: + - name: unit + command: [echo, OK] +tasks: + - name: task-a + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-project-watch/with-include/garden.yml b/garden-service/test/unit/data/test-project-watch/with-include/garden.yml index 0711d3876c..7ea3397b4e 100644 --- a/garden-service/test/unit/data/test-project-watch/with-include/garden.yml +++ b/garden-service/test/unit/data/test-project-watch/with-include/garden.yml @@ -1,4 +1,4 @@ -module: - name: with-include - type: test - include: ["subdir/foo2.txt"] +kind: Module +name: with-include +type: test +include: ["subdir/foo2.txt"] diff --git a/garden-service/test/unit/data/test-project-yaml-file-extensions/garden.yaml b/garden-service/test/unit/data/test-project-yaml-file-extensions/garden.yaml index bd1f17723f..bf500f176a 100644 --- a/garden-service/test/unit/data/test-project-yaml-file-extensions/garden.yaml +++ b/garden-service/test/unit/data/test-project-yaml-file-extensions/garden.yaml @@ -1,11 +1,10 @@ -project: - name: test-project-a - environmentDefaults: - variables: - some: variable - environments: - - name: local - providers: - - name: test-plugin - - name: test-plugin-b - - name: other +kind: Project +name: test-project-a +environments: + - name: local + providers: + - name: test-plugin + - name: test-plugin-b + - name: other +variables: + some: variable diff --git a/garden-service/test/unit/data/test-project-yaml-file-extensions/module-no-config/foo.yml b/garden-service/test/unit/data/test-project-yaml-file-extensions/module-no-config/foo.yml index d1ed9c6757..bd4c709688 100644 --- a/garden-service/test/unit/data/test-project-yaml-file-extensions/module-no-config/foo.yml +++ b/garden-service/test/unit/data/test-project-yaml-file-extensions/module-no-config/foo.yml @@ -1,3 +1,3 @@ -module: - name: module-foo - type: test \ No newline at end of file +kind: Module +name: module-foo +type: test \ No newline at end of file diff --git a/garden-service/test/unit/data/test-project-yaml-file-extensions/module-yaml/garden.yaml b/garden-service/test/unit/data/test-project-yaml-file-extensions/module-yaml/garden.yaml index 8168b8bcbd..8fd5f6d9af 100644 --- a/garden-service/test/unit/data/test-project-yaml-file-extensions/module-yaml/garden.yaml +++ b/garden-service/test/unit/data/test-project-yaml-file-extensions/module-yaml/garden.yaml @@ -1,3 +1,3 @@ -module: - name: module-yaml - type: test +kind: Module +name: module-yaml +type: test diff --git a/garden-service/test/unit/data/test-project-yaml-file-extensions/module-yml/garden.yml b/garden-service/test/unit/data/test-project-yaml-file-extensions/module-yml/garden.yml index a3f8fa94c7..a06d54e122 100644 --- a/garden-service/test/unit/data/test-project-yaml-file-extensions/module-yml/garden.yml +++ b/garden-service/test/unit/data/test-project-yaml-file-extensions/module-yml/garden.yml @@ -1,3 +1,3 @@ -module: - name: module-yml - type: test +kind: Module +name: module-yml +type: test diff --git a/garden-service/test/unit/data/test-projects/duplicate-module/garden.yml b/garden-service/test/unit/data/test-projects/duplicate-module/garden.yml index 06b1cd1c3b..a72298dc2f 100644 --- a/garden-service/test/unit/data/test-projects/duplicate-module/garden.yml +++ b/garden-service/test/unit/data/test-projects/duplicate-module/garden.yml @@ -1,6 +1,6 @@ -project: - name: duplicate-module - environments: - - name: local - providers: - - name: test-plugin +kind: Project +name: duplicate-module +environments: + - name: local + providers: + - name: test-plugin diff --git a/garden-service/test/unit/data/test-projects/duplicate-module/module-a/garden.yml b/garden-service/test/unit/data/test-projects/duplicate-module/module-a/garden.yml index 68a7da128f..abe6a36aa2 100644 --- a/garden-service/test/unit/data/test-projects/duplicate-module/module-a/garden.yml +++ b/garden-service/test/unit/data/test-projects/duplicate-module/module-a/garden.yml @@ -1,3 +1,3 @@ -module: - name: module-a - type: test +kind: Module +name: module-a +type: test diff --git a/garden-service/test/unit/data/test-projects/duplicate-module/module-b/garden.yml b/garden-service/test/unit/data/test-projects/duplicate-module/module-b/garden.yml index 68a7da128f..abe6a36aa2 100644 --- a/garden-service/test/unit/data/test-projects/duplicate-module/module-b/garden.yml +++ b/garden-service/test/unit/data/test-projects/duplicate-module/module-b/garden.yml @@ -1,3 +1,3 @@ -module: - name: module-a - type: test +kind: Module +name: module-a +type: test diff --git a/garden-service/test/unit/data/test-projects/duplicate-service-and-task/garden.yml b/garden-service/test/unit/data/test-projects/duplicate-service-and-task/garden.yml index 06b1cd1c3b..a72298dc2f 100644 --- a/garden-service/test/unit/data/test-projects/duplicate-service-and-task/garden.yml +++ b/garden-service/test/unit/data/test-projects/duplicate-service-and-task/garden.yml @@ -1,6 +1,6 @@ -project: - name: duplicate-module - environments: - - name: local - providers: - - name: test-plugin +kind: Project +name: duplicate-module +environments: + - name: local + providers: + - name: test-plugin diff --git a/garden-service/test/unit/data/test-projects/duplicate-service-and-task/module-a/garden.yml b/garden-service/test/unit/data/test-projects/duplicate-service-and-task/module-a/garden.yml index aab4ec0ace..0a483256b4 100644 --- a/garden-service/test/unit/data/test-projects/duplicate-service-and-task/module-a/garden.yml +++ b/garden-service/test/unit/data/test-projects/duplicate-service-and-task/module-a/garden.yml @@ -1,5 +1,5 @@ -module: - name: module-a - type: test - services: - - name: dupe +kind: Module +name: module-a +type: test +services: + - name: dupe diff --git a/garden-service/test/unit/data/test-projects/duplicate-service-and-task/module-b/garden.yml b/garden-service/test/unit/data/test-projects/duplicate-service-and-task/module-b/garden.yml index f2dde87c46..dc2709cb71 100644 --- a/garden-service/test/unit/data/test-projects/duplicate-service-and-task/module-b/garden.yml +++ b/garden-service/test/unit/data/test-projects/duplicate-service-and-task/module-b/garden.yml @@ -1,5 +1,5 @@ -module: - name: module-b - type: test - tasks: - - name: dupe +kind: Module +name: module-b +type: test +tasks: + - name: dupe diff --git a/garden-service/test/unit/data/test-projects/duplicate-service/garden.yml b/garden-service/test/unit/data/test-projects/duplicate-service/garden.yml index 06b1cd1c3b..a72298dc2f 100644 --- a/garden-service/test/unit/data/test-projects/duplicate-service/garden.yml +++ b/garden-service/test/unit/data/test-projects/duplicate-service/garden.yml @@ -1,6 +1,6 @@ -project: - name: duplicate-module - environments: - - name: local - providers: - - name: test-plugin +kind: Project +name: duplicate-module +environments: + - name: local + providers: + - name: test-plugin diff --git a/garden-service/test/unit/data/test-projects/duplicate-service/module-a/garden.yml b/garden-service/test/unit/data/test-projects/duplicate-service/module-a/garden.yml index aab4ec0ace..0a483256b4 100644 --- a/garden-service/test/unit/data/test-projects/duplicate-service/module-a/garden.yml +++ b/garden-service/test/unit/data/test-projects/duplicate-service/module-a/garden.yml @@ -1,5 +1,5 @@ -module: - name: module-a - type: test - services: - - name: dupe +kind: Module +name: module-a +type: test +services: + - name: dupe diff --git a/garden-service/test/unit/data/test-projects/duplicate-service/module-b/garden.yml b/garden-service/test/unit/data/test-projects/duplicate-service/module-b/garden.yml index 3e4649212c..f4a4a122be 100644 --- a/garden-service/test/unit/data/test-projects/duplicate-service/module-b/garden.yml +++ b/garden-service/test/unit/data/test-projects/duplicate-service/module-b/garden.yml @@ -1,5 +1,5 @@ -module: - name: module-b - type: test - services: - - name: dupe +kind: Module +name: module-b +type: test +services: + - name: dupe diff --git a/garden-service/test/unit/data/test-projects/duplicate-task/garden.yml b/garden-service/test/unit/data/test-projects/duplicate-task/garden.yml index 06b1cd1c3b..a72298dc2f 100644 --- a/garden-service/test/unit/data/test-projects/duplicate-task/garden.yml +++ b/garden-service/test/unit/data/test-projects/duplicate-task/garden.yml @@ -1,6 +1,6 @@ -project: - name: duplicate-module - environments: - - name: local - providers: - - name: test-plugin +kind: Project +name: duplicate-module +environments: + - name: local + providers: + - name: test-plugin diff --git a/garden-service/test/unit/data/test-projects/duplicate-task/module-a/garden.yml b/garden-service/test/unit/data/test-projects/duplicate-task/module-a/garden.yml index 95bf526e42..45d07febc9 100644 --- a/garden-service/test/unit/data/test-projects/duplicate-task/module-a/garden.yml +++ b/garden-service/test/unit/data/test-projects/duplicate-task/module-a/garden.yml @@ -1,5 +1,5 @@ -module: - name: module-a - type: test - tasks: - - name: dupe +kind: Module +name: module-a +type: test +tasks: + - name: dupe diff --git a/garden-service/test/unit/data/test-projects/duplicate-task/module-b/garden.yml b/garden-service/test/unit/data/test-projects/duplicate-task/module-b/garden.yml index f2dde87c46..dc2709cb71 100644 --- a/garden-service/test/unit/data/test-projects/duplicate-task/module-b/garden.yml +++ b/garden-service/test/unit/data/test-projects/duplicate-task/module-b/garden.yml @@ -1,5 +1,5 @@ -module: - name: module-b - type: test - tasks: - - name: dupe +kind: Module +name: module-b +type: test +tasks: + - name: dupe diff --git a/garden-service/test/unit/data/test-projects/helm/api/garden.yml b/garden-service/test/unit/data/test-projects/helm/api/garden.yml index 8eeee0b87d..27a8decd11 100644 --- a/garden-service/test/unit/data/test-projects/helm/api/garden.yml +++ b/garden-service/test/unit/data/test-projects/helm/api/garden.yml @@ -1,15 +1,15 @@ -module: - description: The API backend for the voting UI - type: helm - name: api - releaseName: api-release - serviceResource: - kind: Deployment - containerModule: api-image - values: - image: - tag: ${modules.api-image.version} - ingress: - enabled: true - paths: [/] - hosts: [api.local.app.garden] +kind: Module +description: The API backend for the voting UI +type: helm +name: api +releaseName: api-release +serviceResource: + kind: Deployment + containerModule: api-image +values: + image: + tag: ${modules.api-image.version} + ingress: + enabled: true + paths: [/] + hosts: [api.local.app.garden] diff --git a/garden-service/test/unit/data/test-projects/helm/chart-with-test-pod/garden.yml b/garden-service/test/unit/data/test-projects/helm/chart-with-test-pod/garden.yml index bfa21c733c..28633d8af9 100644 --- a/garden-service/test/unit/data/test-projects/helm/chart-with-test-pod/garden.yml +++ b/garden-service/test/unit/data/test-projects/helm/chart-with-test-pod/garden.yml @@ -1,3 +1,3 @@ -module: - type: helm - name: chart-with-test-pod +kind: Module +type: helm +name: chart-with-test-pod diff --git a/garden-service/test/unit/data/test-projects/helm/duplicate-keys-in-template/garden.yml b/garden-service/test/unit/data/test-projects/helm/duplicate-keys-in-template/garden.yml index 76b6950c7c..1bcfe604ff 100644 --- a/garden-service/test/unit/data/test-projects/helm/duplicate-keys-in-template/garden.yml +++ b/garden-service/test/unit/data/test-projects/helm/duplicate-keys-in-template/garden.yml @@ -1,4 +1,4 @@ -module: - description: Helm chart for the duplicate-keys-in-template container - type: helm - name: duplicate-keys-in-template +kind: Module +description: Helm chart for the duplicate-keys-in-template container +type: helm +name: duplicate-keys-in-template diff --git a/garden-service/test/unit/data/test-projects/helm/garden.yml b/garden-service/test/unit/data/test-projects/helm/garden.yml index 639a6032e0..9a01bcbe5e 100644 --- a/garden-service/test/unit/data/test-projects/helm/garden.yml +++ b/garden-service/test/unit/data/test-projects/helm/garden.yml @@ -1,6 +1,6 @@ -project: - name: helm-test - environments: - - name: local - providers: - - name: local-kubernetes +kind: Project +name: helm-test +environments: + - name: local + providers: + - name: local-kubernetes diff --git a/garden-service/test/unit/data/test-projects/helm/postgres/garden.yml b/garden-service/test/unit/data/test-projects/helm/postgres/garden.yml index f00389b27f..87856e629f 100644 --- a/garden-service/test/unit/data/test-projects/helm/postgres/garden.yml +++ b/garden-service/test/unit/data/test-projects/helm/postgres/garden.yml @@ -1,44 +1,44 @@ -module: - description: Postgres database for storing voting results - type: helm +kind: Module +description: Postgres database for storing voting results +type: helm +name: postgres +chart: stable/postgresql +version: 3.9.2 +serviceResource: + kind: StatefulSet name: postgres - chart: stable/postgresql - version: 3.9.2 - serviceResource: - kind: StatefulSet - name: postgres - tasks: - - name: db-init - args: [ - export, "&&", - psql, - -w, - -U, postgres, - --host, postgres, - --port=5432, - -d, postgres, - -c, "'CREATE TABLE IF NOT EXISTS votes (id VARCHAR(255) NOT NULL UNIQUE, vote VARCHAR(255) NOT NULL, created_at timestamp default NULL)'" - ] - env: - PGPASSWORD: postgres - dependencies: - - postgres - - name: db-clear - args: [ - psql, - -w, - -U, postgres, - --host, postgres, - --port=5432, - -d, postgres, - -c "'TRUNCATE votes'" - ] - env: - PGPASSWORD: postgres - dependencies: - - postgres - values: - # This is a more digestable name than the default one in the template - fullnameOverride: postgres - # This should of course not be used in production - postgresqlPassword: postgres \ No newline at end of file +tasks: + - name: db-init + args: [ + export, "&&", + psql, + -w, + -U, postgres, + --host, postgres, + --port=5432, + -d, postgres, + -c, "'CREATE TABLE IF NOT EXISTS votes (id VARCHAR(255) NOT NULL UNIQUE, vote VARCHAR(255) NOT NULL, created_at timestamp default NULL)'" + ] + env: + PGPASSWORD: postgres + dependencies: + - postgres + - name: db-clear + args: [ + psql, + -w, + -U, postgres, + --host, postgres, + --port=5432, + -d, postgres, + -c "'TRUNCATE votes'" + ] + env: + PGPASSWORD: postgres + dependencies: + - postgres +values: + # This is a more digestable name than the default one in the template + fullnameOverride: postgres + # This should of course not be used in production + postgresqlPassword: postgres \ No newline at end of file diff --git a/garden-service/test/unit/data/test-projects/include-exclude/garden.yml b/garden-service/test/unit/data/test-projects/include-exclude/garden.yml index 2078724274..6a8e8d4717 100644 --- a/garden-service/test/unit/data/test-projects/include-exclude/garden.yml +++ b/garden-service/test/unit/data/test-projects/include-exclude/garden.yml @@ -1,6 +1,6 @@ -project: - name: include-exclude - environments: - - name: local - providers: - - name: test-plugin +kind: Project +name: include-exclude +environments: + - name: local + providers: + - name: test-plugin diff --git a/garden-service/test/unit/data/test-projects/missing-deps/missing-build-dep/garden.yml b/garden-service/test/unit/data/test-projects/missing-deps/missing-build-dep/garden.yml index bd1f17723f..644abd6653 100644 --- a/garden-service/test/unit/data/test-projects/missing-deps/missing-build-dep/garden.yml +++ b/garden-service/test/unit/data/test-projects/missing-deps/missing-build-dep/garden.yml @@ -1,11 +1,8 @@ -project: - name: test-project-a - environmentDefaults: - variables: - some: variable - environments: - - name: local - providers: - - name: test-plugin - - name: test-plugin-b - - name: other +kind: Project +name: test-project-a +environments: + - name: local + providers: + - name: test-plugin + - name: test-plugin-b + - name: other diff --git a/garden-service/test/unit/data/test-projects/missing-deps/missing-build-dep/module-a/garden.yml b/garden-service/test/unit/data/test-projects/missing-deps/missing-build-dep/module-a/garden.yml index 3686a0fb00..78fdbe4314 100644 --- a/garden-service/test/unit/data/test-projects/missing-deps/missing-build-dep/module-a/garden.yml +++ b/garden-service/test/unit/data/test-projects/missing-deps/missing-build-dep/module-a/garden.yml @@ -1,15 +1,15 @@ -module: - name: module-a - type: test - services: - - name: service-a - build: - command: [echo, A] - dependencies: - - missing-build-dep - tests: - - name: unit - command: [echo, OK] - tasks: - - name: task-a - command: [echo, OK] +kind: Module +name: module-a +type: test +services: + - name: service-a +build: + command: [echo, A] + dependencies: + - missing-build-dep +tests: + - name: unit + command: [echo, OK] +tasks: + - name: task-a + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-projects/missing-deps/missing-build-dep/module-b/garden.yml b/garden-service/test/unit/data/test-projects/missing-deps/missing-build-dep/module-b/garden.yml index 6bd8f70222..f09543ae96 100644 --- a/garden-service/test/unit/data/test-projects/missing-deps/missing-build-dep/module-b/garden.yml +++ b/garden-service/test/unit/data/test-projects/missing-deps/missing-build-dep/module-b/garden.yml @@ -1,17 +1,17 @@ -module: - name: module-b - type: test - services: - - name: service-b - dependencies: - - service-a - build: - command: [echo, B] +kind: Module +name: module-b +type: test +services: + - name: service-b dependencies: - - module-a - tests: - - name: unit - command: [echo, OK] - tasks: - - name: task-b - command: [echo, OK] + - service-a +build: + command: [echo, B] + dependencies: + - module-a +tests: + - name: unit + command: [echo, OK] +tasks: + - name: task-b + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-projects/missing-deps/missing-build-dep/module-c/garden.yml b/garden-service/test/unit/data/test-projects/missing-deps/missing-build-dep/module-c/garden.yml index 84ffcaaf3e..4399c14248 100644 --- a/garden-service/test/unit/data/test-projects/missing-deps/missing-build-dep/module-c/garden.yml +++ b/garden-service/test/unit/data/test-projects/missing-deps/missing-build-dep/module-c/garden.yml @@ -1,14 +1,14 @@ -module: - name: module-c - type: test - services: - - name: service-c - build: - dependencies: - - module-b - tests: - - name: unit - command: [echo, OK] - tasks: - - name: task-c - command: [echo, OK] +kind: Module +name: module-c +type: test +services: + - name: service-c +build: + dependencies: + - module-b +tests: + - name: unit + command: [echo, OK] +tasks: + - name: task-c + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-projects/missing-deps/missing-runtime-dep/garden.yml b/garden-service/test/unit/data/test-projects/missing-deps/missing-runtime-dep/garden.yml index bd1f17723f..644abd6653 100644 --- a/garden-service/test/unit/data/test-projects/missing-deps/missing-runtime-dep/garden.yml +++ b/garden-service/test/unit/data/test-projects/missing-deps/missing-runtime-dep/garden.yml @@ -1,11 +1,8 @@ -project: - name: test-project-a - environmentDefaults: - variables: - some: variable - environments: - - name: local - providers: - - name: test-plugin - - name: test-plugin-b - - name: other +kind: Project +name: test-project-a +environments: + - name: local + providers: + - name: test-plugin + - name: test-plugin-b + - name: other diff --git a/garden-service/test/unit/data/test-projects/missing-deps/missing-runtime-dep/module-a/garden.yml b/garden-service/test/unit/data/test-projects/missing-deps/missing-runtime-dep/module-a/garden.yml index 9d287b14cb..e8adee051e 100644 --- a/garden-service/test/unit/data/test-projects/missing-deps/missing-runtime-dep/module-a/garden.yml +++ b/garden-service/test/unit/data/test-projects/missing-deps/missing-runtime-dep/module-a/garden.yml @@ -1,15 +1,15 @@ -module: - name: module-a - type: test - services: - - name: service-a - dependencies: - - missing-runtime-dep - build: - command: [echo, A] - tests: - - name: unit - command: [echo, OK] - tasks: - - name: task-a - command: [echo, OK] +kind: Module +name: module-a +type: test +services: + - name: service-a + dependencies: + - missing-runtime-dep +build: + command: [echo, A] +tests: + - name: unit + command: [echo, OK] +tasks: + - name: task-a + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-projects/missing-deps/missing-runtime-dep/module-b/garden.yml b/garden-service/test/unit/data/test-projects/missing-deps/missing-runtime-dep/module-b/garden.yml index 6bd8f70222..f09543ae96 100644 --- a/garden-service/test/unit/data/test-projects/missing-deps/missing-runtime-dep/module-b/garden.yml +++ b/garden-service/test/unit/data/test-projects/missing-deps/missing-runtime-dep/module-b/garden.yml @@ -1,17 +1,17 @@ -module: - name: module-b - type: test - services: - - name: service-b - dependencies: - - service-a - build: - command: [echo, B] +kind: Module +name: module-b +type: test +services: + - name: service-b dependencies: - - module-a - tests: - - name: unit - command: [echo, OK] - tasks: - - name: task-b - command: [echo, OK] + - service-a +build: + command: [echo, B] + dependencies: + - module-a +tests: + - name: unit + command: [echo, OK] +tasks: + - name: task-b + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-projects/missing-deps/missing-runtime-dep/module-c/garden.yml b/garden-service/test/unit/data/test-projects/missing-deps/missing-runtime-dep/module-c/garden.yml index 84ffcaaf3e..4399c14248 100644 --- a/garden-service/test/unit/data/test-projects/missing-deps/missing-runtime-dep/module-c/garden.yml +++ b/garden-service/test/unit/data/test-projects/missing-deps/missing-runtime-dep/module-c/garden.yml @@ -1,14 +1,14 @@ -module: - name: module-c - type: test - services: - - name: service-c - build: - dependencies: - - module-b - tests: - - name: unit - command: [echo, OK] - tasks: - - name: task-c - command: [echo, OK] +kind: Module +name: module-c +type: test +services: + - name: service-c +build: + dependencies: + - module-b +tests: + - name: unit + command: [echo, OK] +tasks: + - name: task-c + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-projects/module-self-ref/garden.yml b/garden-service/test/unit/data/test-projects/module-self-ref/garden.yml index 06b1cd1c3b..a72298dc2f 100644 --- a/garden-service/test/unit/data/test-projects/module-self-ref/garden.yml +++ b/garden-service/test/unit/data/test-projects/module-self-ref/garden.yml @@ -1,6 +1,6 @@ -project: - name: duplicate-module - environments: - - name: local - providers: - - name: test-plugin +kind: Project +name: duplicate-module +environments: + - name: local + providers: + - name: test-plugin diff --git a/garden-service/test/unit/data/test-projects/multiple-module-config/garden.yml b/garden-service/test/unit/data/test-projects/multiple-module-config/garden.yml index c8aed85f24..84ce498ff8 100644 --- a/garden-service/test/unit/data/test-projects/multiple-module-config/garden.yml +++ b/garden-service/test/unit/data/test-projects/multiple-module-config/garden.yml @@ -1,14 +1,11 @@ -project: - name: test-project-multiple-modules - environmentDefaults: - variables: - some: variable - environments: - - name: local - providers: - - name: test-plugin - - name: test-plugin-b - - name: other +kind: Project +name: test-project-multiple-modules +environments: + - name: local + providers: + - name: test-plugin + - name: test-plugin-b + - name: other --- diff --git a/garden-service/test/unit/data/test-projects/multiple-module-config/module-b/garden.yml b/garden-service/test/unit/data/test-projects/multiple-module-config/module-b/garden.yml index 254d3b6dd0..a3b3bd6e50 100644 --- a/garden-service/test/unit/data/test-projects/multiple-module-config/module-b/garden.yml +++ b/garden-service/test/unit/data/test-projects/multiple-module-config/module-b/garden.yml @@ -1,37 +1,37 @@ -module: - name: module-b1 - type: test - services: - - name: service-b1 - dependencies: - - service-a1 - build: - command: [echo, B] +kind: Module +name: module-b1 +type: test +services: + - name: service-b1 dependencies: - - module-a1 - tests: - - name: unit - command: [echo, OK] - tasks: - - name: task-b1 - command: [echo, OK] + - service-a1 +build: + command: [echo, B] + dependencies: + - module-a1 +tests: + - name: unit + command: [echo, OK] +tasks: + - name: task-b1 + command: [echo, OK] --- -module: - name: module-b2 - type: test - services: - - name: service-b2 - dependencies: - - service-a1 - build: - command: [echo, B] +kind: Module +name: module-b2 +type: test +services: + - name: service-b2 dependencies: - - module-a2 - tests: - - name: unit - command: [echo, OK] - tasks: - - name: task-b2 - command: [echo, OK] + - service-a1 +build: + command: [echo, B] + dependencies: + - module-a2 +tests: + - name: unit + command: [echo, OK] +tasks: + - name: task-b2 + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-projects/multiple-module-config/module-c/garden.yml b/garden-service/test/unit/data/test-projects/multiple-module-config/module-c/garden.yml index 2fb28d6314..7c1d877de2 100644 --- a/garden-service/test/unit/data/test-projects/multiple-module-config/module-c/garden.yml +++ b/garden-service/test/unit/data/test-projects/multiple-module-config/module-c/garden.yml @@ -1,14 +1,14 @@ -module: - name: module-c - type: test - services: - - name: service-c - build: - dependencies: - - module-b1 - tests: - - name: unit - command: [echo, OK] - tasks: - - name: task-c - command: [echo, OK] +kind: Module +name: module-c +type: test +services: + - name: service-c +build: + dependencies: + - module-b1 +tests: + - name: unit + command: [echo, OK] +tasks: + - name: task-c + command: [echo, OK] diff --git a/garden-service/test/unit/data/test-projects/new-provider-spec/garden.yml b/garden-service/test/unit/data/test-projects/new-provider-spec/garden.yml index 05048dda74..29291dd4ae 100644 --- a/garden-service/test/unit/data/test-projects/new-provider-spec/garden.yml +++ b/garden-service/test/unit/data/test-projects/new-provider-spec/garden.yml @@ -1,8 +1,5 @@ kind: Project name: test-project-a -environmentDefaults: - variables: - some: variable environments: - name: local - name: other diff --git a/garden-service/test/unit/data/test-projects/non-string-template-values/garden.yml b/garden-service/test/unit/data/test-projects/non-string-template-values/garden.yml index ec0d40127d..9205c612cc 100644 --- a/garden-service/test/unit/data/test-projects/non-string-template-values/garden.yml +++ b/garden-service/test/unit/data/test-projects/non-string-template-values/garden.yml @@ -1,8 +1,8 @@ -project: - name: non-string-template-values - environments: - - name: local - providers: - - name: test-plugin - variables: - allow-publish: false +kind: Project +name: non-string-template-values +environments: + - name: local + providers: + - name: test-plugin +variables: + allow-publish: false diff --git a/garden-service/test/unit/data/test-projects/source-module/garden.yml b/garden-service/test/unit/data/test-projects/source-module/garden.yml index 06b1cd1c3b..a72298dc2f 100644 --- a/garden-service/test/unit/data/test-projects/source-module/garden.yml +++ b/garden-service/test/unit/data/test-projects/source-module/garden.yml @@ -1,6 +1,6 @@ -project: - name: duplicate-module - environments: - - name: local - providers: - - name: test-plugin +kind: Project +name: duplicate-module +environments: + - name: local + providers: + - name: test-plugin diff --git a/garden-service/test/unit/data/test-projects/source-module/module-a/garden.yml b/garden-service/test/unit/data/test-projects/source-module/module-a/garden.yml index 95bf526e42..45d07febc9 100644 --- a/garden-service/test/unit/data/test-projects/source-module/module-a/garden.yml +++ b/garden-service/test/unit/data/test-projects/source-module/module-a/garden.yml @@ -1,5 +1,5 @@ -module: - name: module-a - type: test - tasks: - - name: dupe +kind: Module +name: module-a +type: test +tasks: + - name: dupe diff --git a/garden-service/test/unit/data/test-projects/source-module/module-b/garden.yml b/garden-service/test/unit/data/test-projects/source-module/module-b/garden.yml index 0ce6d4d402..7a1a540631 100644 --- a/garden-service/test/unit/data/test-projects/source-module/module-b/garden.yml +++ b/garden-service/test/unit/data/test-projects/source-module/module-b/garden.yml @@ -1,6 +1,6 @@ -module: - name: module-b - type: test - services: - - name: service-b - sourceModuleName: module-a +kind: Module +name: module-b +type: test +services: + - name: service-b + sourceModuleName: module-a diff --git a/garden-service/test/unit/data/validate/bad-module/garden.yml b/garden-service/test/unit/data/validate/bad-module/garden.yml index 4e12c51711..dd78ac8870 100644 --- a/garden-service/test/unit/data/validate/bad-module/garden.yml +++ b/garden-service/test/unit/data/validate/bad-module/garden.yml @@ -1,2 +1,2 @@ -project: - name: build-test-project +kind: Project +name: build-test-project diff --git a/garden-service/test/unit/data/validate/bad-project/garden.yml b/garden-service/test/unit/data/validate/bad-project/garden.yml index e113512267..b289b2f6f0 100644 --- a/garden-service/test/unit/data/validate/bad-project/garden.yml +++ b/garden-service/test/unit/data/validate/bad-project/garden.yml @@ -1,2 +1,2 @@ -project: - # missing required name +kind: Project +# missing required name diff --git a/garden-service/test/unit/data/validate/bad-project/ok-module/garden.yml b/garden-service/test/unit/data/validate/bad-project/ok-module/garden.yml index a21cfb1159..fa83f3c64a 100644 --- a/garden-service/test/unit/data/validate/bad-project/ok-module/garden.yml +++ b/garden-service/test/unit/data/validate/bad-project/ok-module/garden.yml @@ -1,5 +1,5 @@ -module: - name: module-a - type: exec - build: - command: [echo, A] +kind: Module +name: module-a +type: exec +build: + command: [echo, A] diff --git a/garden-service/test/unit/src/config/base.ts b/garden-service/test/unit/src/config/base.ts index 9da6726e67..10b8ee015d 100644 --- a/garden-service/test/unit/src/config/base.ts +++ b/garden-service/test/unit/src/config/base.ts @@ -43,9 +43,6 @@ describe("loadConfig", () => { path: projectPathA, configPath, name: "test-project-a", - environmentDefaults: { - variables: { some: "variable" }, - }, environments: [ { name: "local", @@ -58,6 +55,7 @@ describe("loadConfig", () => { name: "other", }, ], + variables: { some: "variable" }, }, ]) }) @@ -119,11 +117,6 @@ describe("loadConfig", () => { kind: "Project", configPath, path: projectPathMultipleModules, - environmentDefaults: { - variables: { - some: "variable", - }, - }, environments: [ { name: "local", @@ -243,9 +236,6 @@ describe("loadConfig", () => { kind: "Project", path: projectPathFlat, configPath, - environmentDefaults: { - variables: { some: "variable" }, - }, environments: [ { name: "local", @@ -259,6 +249,7 @@ describe("loadConfig", () => { }, ], name: "test-project-flat-config", + variables: { some: "variable" }, }, { apiVersion: "garden.io/v0", @@ -300,9 +291,6 @@ describe("loadConfig", () => { path: projectPath, configPath: resolve(projectPath, "garden.yml"), name: "test-project-a", - environmentDefaults: { - variables: { some: "variable" }, - }, environments: [ { name: "local" }, { name: "other" },