Move to external exec package

There is an external package which is also used by k3sup that
can be used here instead of maintaining two copies of the
library.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>

Gopkg.toml

@@ -2,6 +2,10 @@
   name = "gopkg.in/yaml.v2"
   version = "2.2.3"
 
+[[constraint]]
+  name = "github.com/alexellis/go-execute"
+  version = "0.1.1"
+
 [prune]
   go-tests = true
   unused-packages = true

main.go

@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/openfaas-incubator/ofc-bootstrap/pkg/execute"
+	"github.com/alexellis/go-execute"
 	"github.com/openfaas-incubator/ofc-bootstrap/pkg/ingress"
 	"github.com/openfaas-incubator/ofc-bootstrap/pkg/stack"
 	"github.com/openfaas-incubator/ofc-bootstrap/pkg/tls"

pkg/ingress/ingress.go

@@ -2,12 +2,13 @@ package ingress
 
 import (
 	"bytes"
+	"fmt"
 	"html/template"
 	"io/ioutil"
 	"log"
 	"os"
 
-	"github.com/openfaas-incubator/ofc-bootstrap/pkg/execute"
+	"github.com/alexellis/go-execute"
 	"github.com/openfaas-incubator/ofc-bootstrap/pkg/types"
 )
 
@@ -44,25 +45,11 @@ func Apply(plan types.Plan) error {
 	return nil
 }
 
-func applyTemplate(templateFileName string, templateValues IngressTemplate) ([]byte, error) {
-	data, err := ioutil.ReadFile(templateFileName)
-	if err != nil {
-		return nil, err
-	}
-	t := template.Must(template.New(templateFileName).Parse(string(data)))
-
-	buffer := new(bytes.Buffer)
-
-	executeErr := t.Execute(buffer, templateValues)
-
-	return buffer.Bytes(), executeErr
-}
-
 func apply(source string, name string, ingress IngressTemplate) error {
 
 	generatedData, err := applyTemplate("templates/k8s/"+source, ingress)
 	if err != nil {
-		return err
+		return fmt.Errorf("unable to read template %s (%s), error: %q", name, "templates/k8s/"+source, err)
 	}
 
 	tempFilePath := "tmp/generated-ingress-" + name + ".yaml"
@@ -80,7 +67,8 @@ func apply(source string, name string, ingress IngressTemplate) error {
 	}
 
 	execTask := execute.ExecTask{
-		Command: "kubectl apply -f " + tempFilePath,
+		Command: "kubectl",
+		Args:    []string{"apply", "-f", tempFilePath},
 		Shell:   false,
 	}
 
@@ -93,3 +81,17 @@ func apply(source string, name string, ingress IngressTemplate) error {
 
 	return nil
 }
+
+func applyTemplate(templateFileName string, templateValues IngressTemplate) ([]byte, error) {
+	data, err := ioutil.ReadFile(templateFileName)
+	if err != nil {
+		return nil, err
+	}
+	t := template.Must(template.New(templateFileName).Parse(string(data)))
+
+	buffer := new(bytes.Buffer)
+
+	executeErr := t.Execute(buffer, templateValues)
+
+	return buffer.Bytes(), executeErr
+}

pkg/stack/stack.go

@@ -110,20 +110,6 @@ type stackConfig struct {
 	GitHub bool
 }
 
-func applyTemplate(templateFileName string, templateType interface{}) ([]byte, error) {
-	data, err := ioutil.ReadFile(templateFileName)
-	if err != nil {
-		return nil, err
-	}
-	t := template.Must(template.New(templateFileName).Parse(string(data)))
-
-	buffer := new(bytes.Buffer)
-
-	executeErr := t.Execute(buffer, templateType)
-
-	return buffer.Bytes(), executeErr
-}
-
 func generateTemplate(fileName string, plan types.Plan, templateType interface{}) error {
 
 	generatedData, err := applyTemplate("templates/"+fileName+".yml", templateType)
@@ -147,3 +133,17 @@ func generateTemplate(fileName string, plan types.Plan, templateType interface{}
 
 	return nil
 }
+
+func applyTemplate(templateFileName string, templateType interface{}) ([]byte, error) {
+	data, err := ioutil.ReadFile(templateFileName)
+	if err != nil {
+		return nil, err
+	}
+	t := template.Must(template.New(templateFileName).Parse(string(data)))
+
+	buffer := new(bytes.Buffer)
+
+	executeErr := t.Execute(buffer, templateType)
+
+	return buffer.Bytes(), executeErr
+}

pkg/tls/tls.go

@@ -6,7 +6,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/openfaas-incubator/ofc-bootstrap/pkg/execute"
+	"github.com/alexellis/go-execute"
 	"github.com/openfaas-incubator/ofc-bootstrap/pkg/types"
 )
 

pkg/types/secrets.go

@@ -6,7 +6,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/openfaas-incubator/ofc-bootstrap/pkg/execute"
+	"github.com/alexellis/go-execute"
 )
 
 func CreateDockerSecret(kvn KeyValueNamespaceTuple) string {