Template function #37
Conversation
dsl/convertcty.go
Outdated
|
|
||
| switch { | ||
|
|
||
| case val.Type().Equals(cty.String): |
There was a problem hiding this comment.
val.Type() can be done once at the top of the switch statement and then have case: cty.String etc instead
There was a problem hiding this comment.
There was a problem hiding this comment.
I think some of the types can't be done that way. I can get type once however.
Here's their code from go-cty/cty](https://github.com/zclconf/go-cty/tree/v1.13.2/cty) /type.go:
func (t Type) WithoutOptionalAttributesDeep() Type {
switch {
case t == DynamicPseudoType, t.IsPrimitiveType(), t.IsCapsuleType():
return t
case t.IsMapType():
return Map(t.ElementType().WithoutOptionalAttributesDeep())
case t.IsListType():
return List(t.ElementType().WithoutOptionalAttributesDeep())
case t.IsSetType():
return Set(t.ElementType().WithoutOptionalAttributesDeep())
case t.IsTupleType():
originalElemTypes := t.TupleElementTypes()
elemTypes := make([]Type, len(originalElemTypes))
for i, et := range originalElemTypes {
elemTypes[i] = et.WithoutOptionalAttributesDeep()
}
return Tuple(elemTypes)
case t.IsObjectType():There was a problem hiding this comment.
Fixed to get type only once.
dsl/template.go
Outdated
| // Check if variablesVal is a string and try to json.Unmarshal it | ||
| if variablesVal.Type() == cty.String { |
There was a problem hiding this comment.
I'm not keen on this, it's an extra complication that adds a gotcha.
I'd just take the argument as a typed object and drop this implicit string to json conversion. They can already convert it to an object via jsondecode if that's what they meant, but the logic above means they have no choice in the matter. Would be frustrating for users if they ever actually want to pass a json string through.
There was a problem hiding this comment.
Yeah, no problem. Makes sense. I would say, they can't pass just a json string, because the template can't handle that.
dsl/template.go
Outdated
| if filename == "" { | ||
| return "", nil | ||
| } |
There was a problem hiding this comment.
Task said this must return an error for an unknown template file, this silently fails
There was a problem hiding this comment.
Fixed. Also added file not found error in file() function.
https://trello.com/c/LIa6zLZC/1110-add-template-dsl-function