diff options
| author | Vincent Ambo <tazjin@gmail.com> | 2018-06-09T14·23+0200 |
|---|---|---|
| committer | Vincent Ambo <github@tazj.in> | 2018-06-09T17·16+0200 |
| commit | b33c353233aae4d73b1567aee41fd5d4cad5bf76 (patch) | |
| tree | 026eeb9ef627960180d07f84e75639b727f90c70 /context/testdata | |
| parent | 5cf9d53e80accaeede1b4e38772d7d53c0190549 (diff) | |
refactor(context): Implement more explicit merging of variables
The hierarchy for loading variables was previously not expressed explicitly. This commit refactors the logic for merging variables to explicitly set the different layers of variables as values on the context object and merge them for each resource set in `mergeContextValues`.
Diffstat (limited to 'context/testdata')
| -rw-r--r-- | context/testdata/import-vars-override.yaml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/context/testdata/import-vars-override.yaml b/context/testdata/import-vars-override.yaml index c3d47bcfc1fc..c749a2a66ba6 100644 --- a/context/testdata/import-vars-override.yaml +++ b/context/testdata/import-vars-override.yaml @@ -6,4 +6,5 @@ global: import: - test-vars.yaml - test-vars-override.yaml -include: [] +include: + - name: test-set |