refactor: consolidate template functions

uselagoon · Dec 15, 2024 · 654c6be · 654c6be
1 parent 3668bc0
commit 654c6be
Show file tree

Hide file tree

Showing 99 changed files with 483 additions and 249 deletions.
diff --git a/cmd/identify_lagoonservices.go b/cmd/identify_lagoonservices.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/spf13/cobra"
 	generator "github.com/uselagoon/build-deploy-tool/internal/generator"
-	servicestemplates "github.com/uselagoon/build-deploy-tool/internal/templating/services"
+	servicestemplates "github.com/uselagoon/build-deploy-tool/internal/templating"
 )
 
 type identifyServices struct {

diff --git a/cmd/template_autogen_ingress.go b/cmd/template_autogen_ingress.go
@@ -6,7 +6,8 @@ import (
 	"github.com/spf13/cobra"
 	generator "github.com/uselagoon/build-deploy-tool/internal/generator"
 	"github.com/uselagoon/build-deploy-tool/internal/helpers"
-	ingresstemplate "github.com/uselagoon/build-deploy-tool/internal/templating/ingress"
+	servicestemplates "github.com/uselagoon/build-deploy-tool/internal/templating"
+	"sigs.k8s.io/yaml"
 )
 
 var autogenRouteGeneration = &cobra.Command{
@@ -31,17 +32,22 @@ func AutogeneratedIngressGeneration(g generator.GeneratorInput) error {
 		return err
 	}
 	savedTemplates := g.SavedTemplatesPath
-
+	separator := []byte("---\n")
 	// generate the templates
 	for _, route := range lagoonBuild.AutogeneratedRoutes.Routes {
 		// autogenerated routes use the `servicename` as the name of the ingress resource, use `IngressName` in routev2 to handle this
 		if g.Debug {
 			fmt.Printf("Templating autogenerated ingress manifest for %s to %s\n", route.Domain, fmt.Sprintf("%s/%s.yaml", savedTemplates, route.LagoonService))
 		}
-		templateYAML, err := ingresstemplate.GenerateIngressTemplate(route, *lagoonBuild.BuildValues)
+		ingress, err := servicestemplates.GenerateIngressTemplate(route, *lagoonBuild.BuildValues)
+		if err != nil {
+			return fmt.Errorf("couldn't generate template: %v", err)
+		}
+		iBytes, err := yaml.Marshal(ingress)
 		if err != nil {
 			return fmt.Errorf("couldn't generate template: %v", err)
 		}
+		templateYAML := append(separator[:], iBytes[:]...)
 		helpers.WriteTemplateFile(fmt.Sprintf("%s/%s.yaml", savedTemplates, route.LagoonService), templateYAML)
 	}
 

diff --git a/cmd/template_backups.go b/cmd/template_backups.go
@@ -7,7 +7,7 @@ import (
 	"github.com/spf13/cobra"
 	generator "github.com/uselagoon/build-deploy-tool/internal/generator"
 	"github.com/uselagoon/build-deploy-tool/internal/helpers"
-	backuptemplate "github.com/uselagoon/build-deploy-tool/internal/templating/backups"
+	servicestemplates "github.com/uselagoon/build-deploy-tool/internal/templating"
 	"sigs.k8s.io/yaml"
 )
 
@@ -69,16 +69,24 @@ func BackupTemplateGeneration(g generator.GeneratorInput,
 	lagoonBuild.BuildValues.Services = repServices
 
 	// generate the backup schedule templates
-	templateYAML, err := backuptemplate.GenerateBackupSchedule(*lagoonBuild.BuildValues)
+	schedules, err := servicestemplates.GenerateBackupSchedule(*lagoonBuild.BuildValues)
+	if err != nil {
+		return fmt.Errorf("couldn't generate template: %v", err)
+	}
+	templateYAML, err := servicestemplates.TemplateSchedules(schedules)
 	if err != nil {
 		return fmt.Errorf("couldn't generate template: %v", err)
 	}
 	if len(templateYAML) > 0 {
 		helpers.WriteTemplateFile(fmt.Sprintf("%s/%s.yaml", savedTemplates, "k8up-lagoon-backup-schedule"), templateYAML)
 	}
-
+	templateYAML = nil
 	// generate any prebackuppod templates
-	templateYAML, err = backuptemplate.GeneratePreBackupPod(*lagoonBuild.BuildValues)
+	pbps, err := servicestemplates.GeneratePreBackupPod(*lagoonBuild.BuildValues)
+	if err != nil {
+		return fmt.Errorf("couldn't generate template: %v", err)
+	}
+	templateYAML, err = servicestemplates.TemplatePreBackupPods(pbps)
 	if err != nil {
 		return fmt.Errorf("couldn't generate template: %v", err)
 	}

diff --git a/cmd/template_backups_test.go b/cmd/template_backups_test.go
@@ -6,6 +6,7 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/andreyvit/diff"
 	"github.com/uselagoon/build-deploy-tool/internal/dbaasclient"
 	"github.com/uselagoon/build-deploy-tool/internal/helpers"
 	"github.com/uselagoon/build-deploy-tool/internal/lagoon"
@@ -328,8 +329,7 @@ func TestBackupTemplateGeneration(t *testing.T) {
 							t.Errorf("couldn't read file %v: %v", tt.want, err)
 						}
 						if !reflect.DeepEqual(f1, r1) {
-							fmt.Println(string(f1))
-							t.Errorf("resulting templates do not match")
+							t.Errorf("BackupTemplateGeneration() = \n%v", diff.LineDiff(string(r1), string(f1)))
 						}
 					}
 				}

diff --git a/cmd/template_dbaas.go b/cmd/template_dbaas.go
@@ -6,7 +6,7 @@ import (
 	"github.com/spf13/cobra"
 	generator "github.com/uselagoon/build-deploy-tool/internal/generator"
 	"github.com/uselagoon/build-deploy-tool/internal/helpers"
-	dbaasTemplater "github.com/uselagoon/build-deploy-tool/internal/templating/dbaas"
+	servicestemplates "github.com/uselagoon/build-deploy-tool/internal/templating"
 )
 
 var dbaasGeneration = &cobra.Command{
@@ -33,7 +33,11 @@ func DBaaSTemplateGeneration(g generator.GeneratorInput,
 	}
 	savedTemplates := g.SavedTemplatesPath
 
-	templateYAML, err := dbaasTemplater.GenerateDBaaSTemplate(*lagoonBuild.BuildValues)
+	dbaas, err := servicestemplates.GenerateDBaaSTemplate(*lagoonBuild.BuildValues)
+	if err != nil {
+		return fmt.Errorf("couldn't generate template: %v", err)
+	}
+	templateYAML, err := servicestemplates.TemplateConsumers(dbaas)
 	if err != nil {
 		return fmt.Errorf("couldn't generate template: %v", err)
 	}

diff --git a/cmd/template_dbaas_test.go b/cmd/template_dbaas_test.go
@@ -7,6 +7,7 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/andreyvit/diff"
 	"github.com/uselagoon/build-deploy-tool/internal/dbaasclient"
 	"github.com/uselagoon/build-deploy-tool/internal/helpers"
 	"github.com/uselagoon/build-deploy-tool/internal/lagoon"
@@ -184,8 +185,7 @@ func TestDBaaSTemplateGeneration(t *testing.T) {
 							t.Errorf("couldn't read file %v: %v", tt.want, err)
 						}
 						if !reflect.DeepEqual(f1, r1) {
-							fmt.Println(string(f1))
-							t.Errorf("resulting templates do not match")
+							t.Errorf("DBaaSTemplateGeneration() = \n%v", diff.LineDiff(string(r1), string(f1)))
 						}
 					}
 				}

diff --git a/cmd/template_ingress.go b/cmd/template_ingress.go
@@ -6,7 +6,7 @@ import (
 	"github.com/spf13/cobra"
 	generator "github.com/uselagoon/build-deploy-tool/internal/generator"
 	"github.com/uselagoon/build-deploy-tool/internal/helpers"
-	ingresstemplate "github.com/uselagoon/build-deploy-tool/internal/templating/ingress"
+	servicestemplates "github.com/uselagoon/build-deploy-tool/internal/templating"
 )
 
 var routeGeneration = &cobra.Command{
@@ -31,13 +31,16 @@ func IngressTemplateGeneration(g generator.GeneratorInput) error {
 		return err
 	}
 	savedTemplates := g.SavedTemplatesPath
-
 	// generate the templates
 	for _, route := range lagoonBuild.MainRoutes.Routes {
 		if g.Debug {
 			fmt.Printf("Templating ingress manifest for %s to %s\n", route.Domain, fmt.Sprintf("%s/%s.yaml", savedTemplates, route.Domain))
 		}
-		templateYAML, err := ingresstemplate.GenerateIngressTemplate(route, *lagoonBuild.BuildValues)
+		ingress, err := servicestemplates.GenerateIngressTemplate(route, *lagoonBuild.BuildValues)
+		if err != nil {
+			return fmt.Errorf("couldn't generate template: %v", err)
+		}
+		templateYAML, err := servicestemplates.TemplateIngress(ingress)
 		if err != nil {
 			return fmt.Errorf("couldn't generate template: %v", err)
 		}
@@ -53,7 +56,11 @@ func IngressTemplateGeneration(g generator.GeneratorInput) error {
 			if g.Debug {
 				fmt.Printf("Templating active/standby ingress manifest for %s to %s\n", route.Domain, fmt.Sprintf("%s/%s.yaml", savedTemplates, route.Domain))
 			}
-			templateYAML, err := ingresstemplate.GenerateIngressTemplate(route, *lagoonBuild.BuildValues)
+			ingress, err := servicestemplates.GenerateIngressTemplate(route, *lagoonBuild.BuildValues)
+			if err != nil {
+				return fmt.Errorf("couldn't generate template: %v", err)
+			}
+			templateYAML, err := servicestemplates.TemplateIngress(ingress)
 			if err != nil {
 				return fmt.Errorf("couldn't generate template: %v", err)
 			}

diff --git a/cmd/template_lagoonservices.go b/cmd/template_lagoonservices.go
@@ -7,9 +7,7 @@ import (
 	"github.com/spf13/cobra"
 	generator "github.com/uselagoon/build-deploy-tool/internal/generator"
 	"github.com/uselagoon/build-deploy-tool/internal/helpers"
-	"github.com/uselagoon/build-deploy-tool/internal/templating/networkpolicy"
-	"github.com/uselagoon/build-deploy-tool/internal/templating/registrysecret"
-	servicestemplates "github.com/uselagoon/build-deploy-tool/internal/templating/services"
+	servicestemplates "github.com/uselagoon/build-deploy-tool/internal/templating"
 	"sigs.k8s.io/yaml"
 )
 
@@ -62,102 +60,90 @@ func LagoonServiceTemplateGeneration(g generator.GeneratorInput) error {
 	savedTemplates := g.SavedTemplatesPath
 
 	// generate the templates
-	secrets, err := registrysecret.GenerateRegistrySecretTemplate(*lagoonBuild.BuildValues)
+	secrets, err := servicestemplates.GenerateRegistrySecretTemplate(*lagoonBuild.BuildValues)
 	if err != nil {
 		return fmt.Errorf("couldn't generate template: %v", err)
 	}
 	for _, secret := range secrets {
-		serviceBytes, err := yaml.Marshal(secret)
+		templateBytes, err := servicestemplates.TemplateSecret(secret)
 		if err != nil {
 			return fmt.Errorf("couldn't generate template: %v", err)
 		}
-		separator := []byte("---\n")
-		restoreResult := append(separator[:], serviceBytes[:]...)
 		if g.Debug {
 			fmt.Printf("Templating registry secret manifests %s\n", fmt.Sprintf("%s/%s.yaml", savedTemplates, secret.Name))
 		}
-		helpers.WriteTemplateFile(fmt.Sprintf("%s/%s.yaml", savedTemplates, secret.Name), restoreResult)
+		helpers.WriteTemplateFile(fmt.Sprintf("%s/%s.yaml", savedTemplates, secret.Name), templateBytes)
 	}
 	services, err := servicestemplates.GenerateServiceTemplate(*lagoonBuild.BuildValues)
 	if err != nil {
 		return fmt.Errorf("couldn't generate template: %v", err)
 	}
 	for _, d := range services {
-		serviceBytes, err := yaml.Marshal(d)
+		templateBytes, err := servicestemplates.TemplateService(d)
 		if err != nil {
 			return fmt.Errorf("couldn't generate template: %v", err)
 		}
-		separator := []byte("---\n")
-		restoreResult := append(separator[:], serviceBytes[:]...)
 		if g.Debug {
 			fmt.Printf("Templating service manifests %s\n", fmt.Sprintf("%s/service-%s.yaml", savedTemplates, d.Name))
 		}
-		helpers.WriteTemplateFile(fmt.Sprintf("%s/service-%s.yaml", savedTemplates, d.Name), restoreResult)
+		helpers.WriteTemplateFile(fmt.Sprintf("%s/service-%s.yaml", savedTemplates, d.Name), templateBytes)
 	}
 	pvcs, err := servicestemplates.GeneratePVCTemplate(*lagoonBuild.BuildValues)
 	if err != nil {
 		return fmt.Errorf("couldn't generate template: %v", err)
 	}
 	for _, d := range pvcs {
-		serviceBytes, err := yaml.Marshal(d)
+		templateBytes, err := servicestemplates.TemplatePVC(d)
 		if err != nil {
 			return fmt.Errorf("couldn't generate template: %v", err)
 		}
-		separator := []byte("---\n")
-		restoreResult := append(separator[:], serviceBytes[:]...)
 		if g.Debug {
 			fmt.Printf("Templating pvc manifests %s\n", fmt.Sprintf("%s/pvc-%s.yaml", savedTemplates, d.Name))
 		}
-		helpers.WriteTemplateFile(fmt.Sprintf("%s/pvc-%s.yaml", savedTemplates, d.Name), restoreResult)
+		helpers.WriteTemplateFile(fmt.Sprintf("%s/pvc-%s.yaml", savedTemplates, d.Name), templateBytes)
 	}
 	deployments, err := servicestemplates.GenerateDeploymentTemplate(*lagoonBuild.BuildValues)
 	if err != nil {
 		return fmt.Errorf("couldn't generate template: %v", err)
 	}
 	for _, d := range deployments {
-		deploymentBytes, err := yaml.Marshal(d)
+		templateBytes, err := servicestemplates.TemplateDeployment(d)
 		if err != nil {
 			return fmt.Errorf("couldn't generate template: %v", err)
 		}
-		separator := []byte("---\n")
-		restoreResult := append(separator[:], deploymentBytes[:]...)
 		if g.Debug {
 			fmt.Printf("Templating deployment manifests %s\n", fmt.Sprintf("%s/deployment-%s.yaml", savedTemplates, d.Name))
 		}
-		helpers.WriteTemplateFile(fmt.Sprintf("%s/deployment-%s.yaml", savedTemplates, d.Name), restoreResult)
+		helpers.WriteTemplateFile(fmt.Sprintf("%s/deployment-%s.yaml", savedTemplates, d.Name), templateBytes)
 	}
 	cronjobs, err := servicestemplates.GenerateCronjobTemplate(*lagoonBuild.BuildValues)
 	if err != nil {
 		return fmt.Errorf("couldn't generate template: %v", err)
 	}
 	for _, d := range cronjobs {
-		deploymentBytes, err := yaml.Marshal(d)
+		templateBytes, err := servicestemplates.TemplateCronjobs(d)
 		if err != nil {
 			return fmt.Errorf("couldn't generate template: %v", err)
 		}
-		separator := []byte("---\n")
-		restoreResult := append(separator[:], deploymentBytes[:]...)
 		if g.Debug {
 			fmt.Printf("Templating cronjob manifests %s\n", fmt.Sprintf("%s/cronjob-%s.yaml", savedTemplates, d.Name))
 		}
-		helpers.WriteTemplateFile(fmt.Sprintf("%s/cronjob-%s.yaml", savedTemplates, d.Name), restoreResult)
+		helpers.WriteTemplateFile(fmt.Sprintf("%s/cronjob-%s.yaml", savedTemplates, d.Name), templateBytes)
 	}
 	if lagoonBuild.BuildValues.IsolationNetworkPolicy {
 		// if isolation network policies are enabled, template that here
-		np, err := networkpolicy.GenerateNetworkPolicy(*lagoonBuild.BuildValues)
+		np, err := servicestemplates.GenerateNetworkPolicy(*lagoonBuild.BuildValues)
 		if err != nil {
 			return fmt.Errorf("couldn't generate template: %v", err)
 		}
-		npBytes, err := yaml.Marshal(np)
+		templateBytes, err := servicestemplates.TemplateNetworkPolicy(np)
 		if err != nil {
 			return fmt.Errorf("couldn't generate template: %v", err)
 		}
-		separator := []byte("---\n")
-		restoreResult := append(separator[:], npBytes[:]...)
 		if g.Debug {
 			fmt.Printf("Templating networkpolicy manifest %s\n", fmt.Sprintf("%s/isolation-network-policy.yaml", savedTemplates))
 		}
-		helpers.WriteTemplateFile(fmt.Sprintf("%s/isolation-network-policy.yaml", savedTemplates), restoreResult)
+		helpers.WriteTemplateFile(fmt.Sprintf("%s/isolation-network-policy.yaml", savedTemplates), templateBytes)
 	}
 	return nil
 }