Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Templating utilities for JSON data and KV navigation #111

Merged
merged 2 commits into from
Aug 4, 2014
Merged

Templating utilities for JSON data and KV navigation #111

merged 2 commits into from
Aug 4, 2014

Conversation

johnrengelman
Copy link
Contributor

This also includes some integration tests for Consul since they are dependent upon using the JSON parsing functions. (#102)

@kelseyhightower
Copy link
Owner

Really nice, if test pass it this getting merged!

@johnrengelman
Copy link
Contributor Author

Also, this should supersede #103 & #101

@@ -115,10 +115,14 @@ func (t *TemplateResource) createStageFile() error {
// Add template functions
tplFuncMap := make(template.FuncMap)
tplFuncMap["base"] = path.Base
tplFuncMap["parent"] = path.Dir
tplFuncMap["sibling"] = t.GetSibling
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might rename this later, but for now I think it works.

@kelseyhightower
Copy link
Owner

@johnrengelman Yep, I love when we can merge efforts like this.

@kelseyhightower kelseyhightower added this to the 0.6.0-alpha2 milestone Aug 4, 2014
kelseyhightower added a commit that referenced this pull request Aug 4, 2014
Templating utilities for JSON data and KV navigation
@kelseyhightower kelseyhightower merged commit 0c4fd25 into kelseyhightower:0.6.x Aug 4, 2014
@carmstrong
Copy link
Collaborator

Can we also merge this into the 0.5.x branch?

tomdee pushed a commit to tomdee/confd that referenced this pull request Jun 12, 2018
…ed-libcalico-update

Automatic update of libcalico-go to e3351395c934cee118999b9d29508e9280fa75ec
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants