maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(context): Ensure resource set paths are made absolute

Browse source 
Resolving of files (for `insertFile` and `insertTemplate`) should
always be relative to the resource set location, the previous
behaviour was considered a bug.

This is fixed by ensuring that resource set paths are absolute at
context loading time.
This commit is contained in:
Vincent Ambo 2019-09-04 10:56:07 +01:00 • committed by Vincent Ambo
parent 75a3cd2534
commit d0f52766b3
3 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
context/context_test.go
View file

@ -32,7 +32,7 @@ func TestLoadFlatContextFromFile(t *testing.T) {
ResourceSets: []ResourceSet{
{
Name: "some-api",
Path: "some-api",
Path: "testdata/some-api",
Values: map[string]interface{}{
"apiPort": float64(4567), // yep!
"importantFeature": true,
@ -67,7 +67,7 @@ func TestLoadContextWithArgs(t *testing.T) {
ResourceSets: []ResourceSet{
{
Name: "some-api",
Path: "some-api",
Path: "testdata/some-api",
Values: make(map[string]interface{}, 0),
Args: []string{
"--as=some-user",
@ -106,7 +106,7 @@ func TestLoadContextWithResourceSetCollections(t *testing.T) {
ResourceSets: []ResourceSet{
{
Name: "some-api",
Path: "some-api",
Path: "testdata/some-api",
Values: map[string]interface{}{
"apiPort": float64(4567), // yep!
"importantFeature": true,
@ -118,7 +118,7 @@ func TestLoadContextWithResourceSetCollections(t *testing.T) {
},
{
Name: "collection/nested",
Path: "collection/nested",
Path: "testdata/collection/nested",
Values: map[string]interface{}{
"lizards": "good",
"globalVar": "lizards",
@ -152,7 +152,7 @@ func TestSubresourceVariableInheritance(t *testing.T) {
ResourceSets: []ResourceSet{
{
Name: "parent/child",
Path: "parent/child",
Path: "testdata/parent/child",
Values: map[string]interface{}{
"foo": "bar",
"bar": "baz",
@ -185,7 +185,7 @@ func TestSubresourceVariableInheritanceOverride(t *testing.T) {
ResourceSets: []ResourceSet{
{
Name: "parent/child",
Path: "parent/child",
Path: "testdata/parent/child",
Values: map[string]interface{}{
"foo": "newvalue",
},
@ -256,7 +256,7 @@ func TestExplicitPathLoading(t *testing.T) {
ResourceSets: []ResourceSet{
{
Name: "some-api-europe",
Path: "some-api",
Path: "testdata/some-api",
Values: map[string]interface{}{
"location": "europe",
},
@ -265,7 +265,7 @@ func TestExplicitPathLoading(t *testing.T) {
},
{
Name: "some-api-asia",
Path: "some-api",
Path: "testdata/some-api",
Values: map[string]interface{}{
"location": "asia",
},
@ -296,7 +296,7 @@ func TestExplicitSubresourcePathLoading(t *testing.T) {
ResourceSets: []ResourceSet{
{
Name: "parent/child",
Path: "parent-path/child-path",
Path: "testdata/parent-path/child-path",
Parent: "parent",
Values: make(map[string]interface{}, 0),
},