Commit e1cb0ede authored by vaikas-google's avatar vaikas-google

handle fetching number of urls as a unit that get pooled into a single template…

handle fetching number of urls as a unit that get pooled into a single template so that helm works out of the box
parent 8ba0eb4f
...@@ -21,6 +21,7 @@ import ( ...@@ -21,6 +21,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"log"
"net/http" "net/http"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
...@@ -140,6 +141,8 @@ func (e *expander) ExpandTemplate(t *common.Template) (*ExpandedTemplate, error) ...@@ -140,6 +141,8 @@ func (e *expander) ExpandTemplate(t *common.Template) (*ExpandedTemplate, error)
t.Imports = append(t.Imports, newImp...) t.Imports = append(t.Imports, newImp...)
log.Printf("Got Imports as %#v", t.Imports)
for { for {
// Now expand with everything imported. // Now expand with everything imported.
result, err := e.expandTemplate(t) result, err := e.expandTemplate(t)
...@@ -166,6 +169,7 @@ func (e *expander) ExpandTemplate(t *common.Template) (*ExpandedTemplate, error) ...@@ -166,6 +169,7 @@ func (e *expander) ExpandTemplate(t *common.Template) (*ExpandedTemplate, error)
// If the new imports contain nothing, we are done. Everything is fully expanded. // If the new imports contain nothing, we are done. Everything is fully expanded.
if len(newImp) == 0 { if len(newImp) == 0 {
result.Layout = finalLayout result.Layout = finalLayout
log.Printf("Returning config as %#v", result)
return result, nil return result, nil
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment