Disallow strings as arguments to concat

The concat interpolation function now only accepts list arguments.
Strings are no longer supported, for concatenation or appending to
lists. All arguments must be a list, and single elements can be promoted
with the `list` interpolation function.
This commit is contained in:
James Bardin 2016-08-01 15:06:20 -04:00
parent d85007b55a
commit c15c0eb0cb
2 changed files with 19 additions and 10 deletions

View File

@ -320,8 +320,6 @@ func interpolationFuncConcat() ast.Function {
for _, arg := range args {
switch arg := arg.(type) {
case string:
outputList = append(outputList, ast.Variable{Type: ast.TypeString, Value: arg})
case []ast.Variable:
for _, v := range arg {
switch v.Type {
@ -337,7 +335,7 @@ func interpolationFuncConcat() ast.Function {
}
default:
return nil, fmt.Errorf("concat() does not support %T", arg)
return nil, fmt.Errorf("concat() does not support type %T", arg)
}
}

View File

@ -362,17 +362,19 @@ func TestInterpolateFuncConcat(t *testing.T) {
testFunction(t, testFunctionConfig{
Cases: []testFunctionCase{
// String + list
// no longer supported, now returns an error
{
`${concat("a", split(",", "b,c"))}`,
[]interface{}{"a", "b", "c"},
false,
nil,
true,
},
// List + string
// no longer supported, now returns an error
{
`${concat(split(",", "a,b"), "c")}`,
[]interface{}{"a", "b", "c"},
false,
nil,
true,
},
// Single list
@ -427,6 +429,14 @@ func TestInterpolateFuncConcat(t *testing.T) {
false,
},
// multiple strings
// no longer supported, now returns an error
{
`${concat("string1", "string2")}`,
nil,
true,
},
// mismatched types
{
`${concat("${var.lists}", "${var.maps}")}`,
@ -1532,15 +1542,16 @@ type testFunctionCase struct {
func testFunction(t *testing.T, config testFunctionConfig) {
for i, tc := range config.Cases {
fmt.Println("running", i)
ast, err := hil.Parse(tc.Input)
if err != nil {
t.Fatalf("Case #%d: input: %#v\nerr: %s", i, tc.Input, err)
t.Fatalf("Case #%d: input: %#v\nerr: %v", i, tc.Input, err)
}
result, err := hil.Eval(ast, langEvalConfig(config.Vars))
t.Logf("err: %s", err)
t.Logf("err: %v", err)
if err != nil != tc.Error {
t.Fatalf("Case #%d:\ninput: %#v\nerr: %s", i, tc.Input, err)
t.Fatalf("Case #%d:\ninput: %#v\nerr: %v", i, tc.Input, err)
}
if !reflect.DeepEqual(result.Value, tc.Result) {