maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix main: Fix 'kontemplate template' output

Browse source
This commit is contained in:
Vincent Ambo 2017-06-11 21:43:02 +02:00
parent 162b962fad
commit 3cba344fbe
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
main.go
View file

@ -80,10 +80,13 @@ func versionCommand() {
} }
func templateCommand() { func templateCommand() {
_, resources := loadContextAndResources(templateFile) _, resourceSets := loadContextAndResources(templateFile)
for _, r := range *resources { for _, rs := range *resourceSets {
fmt.Println(r) for _, r := range rs.Resources {
fmt.Fprintf(os.Stderr, "Rendered file %s/%s:\n", rs.Name, r.Filename)
fmt.Println(r.Rendered)
}
} }
} }
@ -163,7 +166,7 @@ func runKubectlWithResources(c *context.Context, kubectlArgs *[]string, resource
} }
for _, r := range resourceSet.Resources { for _, r := range resourceSet.Resources {
fmt.Printf("Passing file %s/%s to kubectl", resourceSet.Name, r.Filename) fmt.Printf("Passing file %s/%s to kubectl\n", resourceSet.Name, r.Filename)
fmt.Fprintln(stdin, r.Rendered) fmt.Fprintln(stdin, r.Rendered)
} }
stdin.Close() stdin.Close()

4
templater/templater.go
View file

@ -42,7 +42,7 @@ type RenderedResourceSet struct {
func LoadAndApplyTemplates(include *[]string, exclude *[]string, c *context.Context) ([]RenderedResourceSet, error) { func LoadAndApplyTemplates(include *[]string, exclude *[]string, c *context.Context) ([]RenderedResourceSet, error) {
limitedResourceSets := applyLimits(&c.ResourceSets, include, exclude) limitedResourceSets := applyLimits(&c.ResourceSets, include, exclude)
renderedResourceSets := make([]RenderedResourceSet, len(c.ResourceSets)) renderedResourceSets := make([]RenderedResourceSet, 0)
if len(*limitedResourceSets) == 0 { if len(*limitedResourceSets) == 0 {
return renderedResourceSets, fmt.Errorf("No valid resource sets included!") return renderedResourceSets, fmt.Errorf("No valid resource sets included!")
@ -83,7 +83,7 @@ func processResourceSet(c *context.Context, rs *context.ResourceSet) (*RenderedR
} }
func processFiles(c *context.Context, rs *context.ResourceSet, rp string, files []os.FileInfo) ([]RenderedResource, error) { func processFiles(c *context.Context, rs *context.ResourceSet, rp string, files []os.FileInfo) ([]RenderedResource, error) {
resources := make([]RenderedResource, len(c.ResourceSets)) resources := make([]RenderedResource, 0)
for _, file := range files { for _, file := range files {
if !file.IsDir() && isResourceFile(file) { if !file.IsDir() && isResourceFile(file) {