Merge pull request #6 from UKHomeOffice/fixes

Few fixes

Author: vaijab

main.go

@@ -92,17 +92,13 @@ func run(c *cli.Context) error {
 		}
 		defer f.Close()
 
-		resource := ObjectResource{}
-		resource.FileName = fn
-		data, err := ioutil.ReadAll(f)
-		if err != nil {
+		resource := ObjectResource{FileName: fn}
+		if err := render(&resource, envToMap()); err != nil {
 			return cli.NewExitError(err.Error(), 1)
 		}
-		if err := yaml.Unmarshal(data, &resource); err != nil {
+		if err := yaml.Unmarshal(resource.Template, &resource); err != nil {
 			return cli.NewExitError(err.Error(), 1)
 		}
-		resource.Template = data
-
 		if err := deploy(c, &resource); err != nil {
 			return cli.NewExitError(err.Error(), 1)
 		}
@@ -119,9 +115,7 @@ func deploy(c *cli.Context, r *ObjectResource) error {
 		return err
 	}
 
-	if err = render(r, envToMap(), stdin); err != nil {
-		return err
-	}
+	stdin.Write(r.Template)
 	stdin.Close()
 	if err != nil {
 		return err
@@ -159,7 +153,7 @@ func deploy(c *cli.Context, r *ObjectResource) error {
 			continue
 		}
 
-		if r.DeploymentStatus.UnavailableReplicas == 0 {
+		if r.DeploymentStatus.UnavailableReplicas == 0 || r.DeploymentStatus.AvailableReplicas == r.DeploymentStatus.Replicas {
 			fmt.Printf("%q deployment is complete. Available replicas: %d.\n",
 				r.Name, r.DeploymentStatus.AvailableReplicas)
 			return nil

tmpl.go

@@ -1,18 +1,24 @@
 package main
 
 import (
-	"io"
+	"bytes"
+	"io/ioutil"
 	"os"
 	"strings"
 	"text/template"
 )
 
-func render(r *ObjectResource, vars map[string]string, w io.Writer) error {
-	t := template.Must(template.New(r.FileName).Parse(string(r.Template)))
-	err := t.Execute(w, vars)
+func render(r *ObjectResource, vars map[string]string) error {
+	tmpl, err := ioutil.ReadFile(r.FileName)
 	if err != nil {
 		return err
 	}
+	var b bytes.Buffer
+	t := template.Must(template.New(r.FileName).Parse(string(tmpl)))
+	if err = t.Execute(&b, vars); err != nil {
+		return err
+	}
+	r.Template = b.Bytes()
 	return nil
 }