Config templates #6
Conversation
config/config.go
Outdated
| type TemplateConfig struct { | ||
| Name string `hcl:",key"` | ||
| Content string `hcl:"content"` | ||
| Count int `hcl:"count"` |
There was a problem hiding this comment.
At the moment this isn't used. I should either decide on implementing the "count" template feature, or remove this field.
config/config.go
Outdated
| if err != nil { | ||
| return nil, err | ||
| } | ||
| err = interpolateVariables(vars, config) |
There was a problem hiding this comment.
Rename this to prepareVariables
| "github.com/hashicorp/hil" | ||
| "github.com/hashicorp/hil/ast" | ||
| "github.com/openpixel/rise/config" | ||
| "github.com/openpixel/rise/interpolation" | ||
| ) | ||
|
|
||
| // Template is a container for holding onto the ast Variables | ||
| type Template struct { |
There was a problem hiding this comment.
Now that we have an object of type "Template" part of config, it seems confusing to also have this object. I'm going to consider renaming this.
template/template.go
Outdated
| return n | ||
| } | ||
|
|
||
| if strings.HasPrefix(varName, "tmpl.") { |
There was a problem hiding this comment.
I wonder if I was to perform interpolation on each variable (by looking at prefix var. and then run the visit function on all new template nodes, if this would increase performance. At this point, I am visiting the tree just for templates and then running Eval on the tree, which visits the nodes again.
template/template.go
Outdated
| case *ast.VariableAccess: | ||
| varName = vn.Name | ||
| case *ast.Index: | ||
| if va, ok := vn.Target.(*ast.VariableAccess); ok { |
There was a problem hiding this comment.
I actually need to run the template function whenever a reference to *ast.VariableAccess is found. at the moment, if it finds a Target & Key, it will only run it once.
On top of that, when it finds an *ast.Index, that is when I need to look at adding a "index" variable to the substitution.
Fixes #5.
There were a few major changes in this release.
--varsoption to--config, -c. This allows for future extensions to the configuration files.templatesections to configurationRendermethod to now utilize the visitor pattern from hilvarkey and templates at thetmplkey.