go/hcl
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

zcl: Automatically convert key types when indexing

Browse Source 
For example, if a map is indexed with a number then we'll automatically
convert it to string before attempting to use it as an index.
This commit is contained in:
Martin Atkins 2017-06-05 07:39:14 -07:00
parent 36eacf5110
commit b604827bb2
1 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
zcl/ops.go
View File

@ -1,7 +1,10 @@
package zcl package zcl
import ( import (
"fmt"
"github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty"
"github.com/zclconf/go-cty/cty/convert"
) )
// Index is a helper function that performs the same operation as the index // Index is a helper function that performs the same operation as the index
@ -46,6 +49,32 @@ func Index(collection, key cty.Value, srcRange *Range) (cty.Value, Diagnostics)
switch { switch {
case ty.IsListType() || ty.IsTupleType() || ty.IsMapType(): case ty.IsListType() || ty.IsTupleType() || ty.IsMapType():
var wantType cty.Type
switch {
case ty.IsListType() || ty.IsTupleType():
wantType = cty.Number
case ty.IsMapType():
wantType = cty.String
default:
// should never happen
panic("don't know what key type we want")
}
key, keyErr := convert.Convert(key, wantType)
if keyErr != nil {
return cty.DynamicVal, Diagnostics{
{
Severity: DiagError,
Summary: "Invalid index",
Detail: fmt.Sprintf(
"The given key does not identify an element in this collection value: %s.",
keyErr.Error(),
),
Subject: srcRange,
},
}
}
has := collection.HasIndex(key) has := collection.HasIndex(key)
if !has.IsKnown() { if !has.IsKnown() {
if ty.IsTupleType() { if ty.IsTupleType() {
@ -59,7 +88,7 @@ func Index(collection, key cty.Value, srcRange *Range) (cty.Value, Diagnostics)
{ {
Severity: DiagError, Severity: DiagError,
Summary: "Invalid index", Summary: "Invalid index",
Detail: "The given index value does not identify an element in this collection value.", Detail: "The given key does not identify an element in this collection value.",
Subject: srcRange, Subject: srcRange,
}, },
} }
@ -68,13 +97,17 @@ func Index(collection, key cty.Value, srcRange *Range) (cty.Value, Diagnostics)
return collection.Index(key), nil return collection.Index(key), nil
case ty.IsObjectType(): case ty.IsObjectType():
if kty != cty.String { key, keyErr := convert.Convert(key, cty.String)
if keyErr != nil {
return cty.DynamicVal, Diagnostics{ return cty.DynamicVal, Diagnostics{
{ {
Severity: DiagError, Severity: DiagError,
Summary: "Invalid index", Summary: "Invalid index",
Detail: "The given key does not identify an element in this collection value. A string key is required.", Detail: fmt.Sprintf(
Subject: srcRange, "The given key does not identify an element in this collection value: %s.",
keyErr.Error(),
),
Subject: srcRange,
}, },
} }
} }
@ -92,7 +125,7 @@ func Index(collection, key cty.Value, srcRange *Range) (cty.Value, Diagnostics)
{ {
Severity: DiagError, Severity: DiagError,
Summary: "Invalid index", Summary: "Invalid index",
Detail: "The given index value does not identify an element in this collection value.", Detail: "The given key does not identify an element in this collection value.",
Subject: srcRange, Subject: srcRange,
}, },
} }