Expose custom_templates to end-users

- this change allows end-users provisioning ofc to opt into which
template repos they want to use
- tested with kind - git-tar showed the correct overridden list
in the expected format

Signed-off-by: Alex Ellis <alexellis2@gmail.com>

Author: alexellis

example.init.yaml

@@ -153,6 +153,12 @@ root_domain: "myfaas.club"
 ## Keep active if using a cluster with a LoadBalancer available.
 ingress: loadbalancer
 
+deployment:
+  custom_templates:
+    - "https://github.com/openfaas-incubator/node8-express-template.git"
+    - "https://github.com/openfaas-incubator/golang-http-template.git"
+    - "https://github.com/openfaas-incubator/node10-express-template.git"
+
 scm: github
 # scm: gitlab
 

pkg/stack/stack.go

@@ -10,11 +10,12 @@ import (
 )
 
 type gatewayConfig struct {
-	Registry     string
-	RootDomain   string
-	CustomersURL string
-	Scheme       string
-	S3           types.S3
+	Registry        string
+	RootDomain      string
+	CustomersURL    string
+	Scheme          string
+	S3              types.S3
+	CustomTemplates string
 }
 
 type authConfig struct {
@@ -34,12 +35,14 @@ func Apply(plan types.Plan) error {
 	}
 
 	gwConfigErr := generateTemplate("gateway_config", plan, gatewayConfig{
-		Registry:     plan.Registry,
-		RootDomain:   plan.RootDomain,
-		CustomersURL: plan.CustomersURL,
-		Scheme:       scheme,
-		S3:           plan.S3,
+		Registry:        plan.Registry,
+		RootDomain:      plan.RootDomain,
+		CustomersURL:    plan.CustomersURL,
+		Scheme:          scheme,
+		S3:              plan.S3,
+		CustomTemplates: plan.Deployment.FormatCustomTemplates(),
 	})
+
 	if gwConfigErr != nil {
 		return gwConfigErr
 	}

pkg/types/deployment_test.go

@@ -0,0 +1,50 @@
+package types
+
+import (
+	"testing"
+)
+
+func TestFormatCustomTemplates_None(t *testing.T) {
+
+	d := Deployment{
+		CustomTemplate: []string{},
+	}
+
+	want := ""
+	got := d.FormatCustomTemplates()
+	if got != want {
+		t.Errorf("FormatCustomTemplates want: %s, got %s", want, got)
+		t.Fail()
+	}
+}
+
+func TestFormatCustomTemplates_Single(t *testing.T) {
+
+	d := Deployment{
+		CustomTemplate: []string{"https://w.com/repo1"},
+	}
+
+	want := d.CustomTemplate[0]
+	got := d.FormatCustomTemplates()
+	if got != want {
+		t.Errorf("FormatCustomTemplates want: %s, got %s", want, got)
+		t.Fail()
+	}
+}
+
+func TestFormatCustomTemplates_Two(t *testing.T) {
+
+	d := Deployment{
+		CustomTemplate: []string{
+			"https://w.com/repo1",
+			"https://w.com/repo2",
+		},
+	}
+
+	want := d.CustomTemplate[0] + ", " + d.CustomTemplate[1]
+	got := d.FormatCustomTemplates()
+	if got != want {
+		t.Errorf("FormatCustomTemplates want: %s, got %s", want, got)
+		t.Fail()
+	}
+}

pkg/types/types.go

@@ -50,6 +50,23 @@ type Plan struct {
 	TLSConfig     TLSConfig                `yaml:"tls_config"`
 	Slack         Slack                    `yaml:"slack"`
 	Ingress       string                   `yaml:"ingress"`
+	Deployment    Deployment               `yaml:"deployment"`
+}
+
+// Deployment is the deployment section of YAML concerning
+// functions as deployed
+type Deployment struct {
+	CustomTemplate []string `yaml:"custom_templates"`
+}
+
+// FormatCustomTemplates are formatted in a CSV format with a space after each comma
+func (d Deployment) FormatCustomTemplates() string {
+	val := ""
+	for _, templateURL := range d.CustomTemplate {
+		val = val + templateURL + ", "
+	}
+
+	return strings.TrimRight(val, " ,")
 }
 
 type KeyValueTuple struct {

templates/gateway_config.yml

@@ -8,7 +8,7 @@ environment:
   gateway_pretty_url: {{.Scheme}}://user.{{.RootDomain}}/function
   # Add your custom templates by adding a coma separated URL, i.e. extend the current value with:
   # ", https://github.com/custom/template.git, https://github.com/custom/template2.git"
-  custom_templates: "https://github.com/openfaas-incubator/node8-express-template.git, https://github.com/openfaas-incubator/golang-http-template.git, https://github.com/openfaas-incubator/node10-express-template.git"
+  custom_templates: {{ .CustomTemplates }}
 
 # Security
   customers_url: "{{.CustomersURL}}"