fix: Deployment (and cronjob) template error handling (#453)

* Fix: add error handling for deployment template

With error logging and test.

* Fix: add error handling for cronjob template

With error logging and associated test

* Chore: Correctly format Go files (sorry)

---------

Co-authored-by: Drew Robinson <[email protected]>

Author: ocean

internal/templating/templates_cronjob.go

@@ -119,7 +119,10 @@ func GenerateCronjobTemplate(
 				if err != nil {
 					return nil, err
 				}
-				podTemplateSpec, _ := generatePodTemplateSpec(buildValues, serviceValues, serviceTypeValues, cronjob.ObjectMeta, templateAnnotations, nCronjob.Name, nCronjob.Command)
+				podTemplateSpec, err := generatePodTemplateSpec(buildValues, serviceValues, serviceTypeValues, cronjob.ObjectMeta, templateAnnotations, nCronjob.Name, nCronjob.Command)
+				if err != nil {
+					return nil, fmt.Errorf("couldn't generate cronjob template for service %s: %v", serviceValues.OverrideName, err)
+				}
 				// end cronjob template
 				cronjob.Spec.JobTemplate.Spec.Template = *podTemplateSpec
 				result = append(result, *cronjob)

internal/templating/templates_cronjob_test.go

@@ -3,6 +3,7 @@ package templating
 import (
 	"os"
 	"reflect"
+	"strings"
 	"testing"
 
 	"github.com/andreyvit/diff"
@@ -222,3 +223,43 @@ func TestGenerateCronjobTemplate(t *testing.T) {
 		})
 	}
 }
+
+func TestGenerateCronjobTemplate_ErrorHandling(t *testing.T) {
+	// Test that errors from generatePodTemplateSpec are properly propagated
+	buildValues := generator.BuildValues{
+		Project:         "test-project",
+		Environment:     "test-env",
+		EnvironmentType: "production",
+		Namespace:       "test-namespace",
+		Branch:          "main",
+		GitSHA:          "abcd1234",
+		LagoonVersion:   "v2.0.0",
+		Kubernetes:      "local",
+		Services: []generator.ServiceValues{
+			{
+				Name:         "cli",
+				OverrideName: "cli",
+				Type:         "cli",
+				NativeCronjobs: []lagoon.Cronjob{
+					{
+						Name:     "test-cronjob",
+						Schedule: "0 * * * *",
+						Command:  "echo test",
+					},
+				},
+			},
+		},
+		// Intentionally missing ImageReferences to trigger error
+		ImageReferences: map[string]string{},
+	}
+
+	_, err := GenerateCronjobTemplate(buildValues)
+	if err == nil {
+		t.Error("GenerateCronjobTemplate() should return error when image reference is missing")
+	}
+
+	expectedErrMsg := "couldn't generate cronjob template for service cli"
+	if err != nil && !strings.Contains(err.Error(), expectedErrMsg) {
+		t.Errorf("GenerateCronjobTemplate() error = %v, want error containing %v", err, expectedErrMsg)
+	}
+}

internal/templating/templates_deployment.go

@@ -140,7 +140,10 @@ func GenerateDeploymentTemplate(
 			}
 			deployment.Spec.Strategy = serviceTypeValues.Strategy
 
-			podTemplateSpec, _ := generatePodTemplateSpec(buildValues, serviceValues, serviceTypeValues, deployment.ObjectMeta, templateAnnotations, serviceTypeValues.PrimaryContainer.Name, "")
+			podTemplateSpec, err := generatePodTemplateSpec(buildValues, serviceValues, serviceTypeValues, deployment.ObjectMeta, templateAnnotations, serviceTypeValues.PrimaryContainer.Name, "")
+			if err != nil {
+				return nil, fmt.Errorf("couldn't generate deployment template for service %s: %v", serviceValues.OverrideName, err)
+			}
 			// end cronjob template
 			deployment.Spec.Template = *podTemplateSpec
 			if buildValues.PodSpreadConstraints {

internal/templating/templates_deployment_test.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"os"
 	"reflect"
+	"strings"
 	"testing"
 
 	"github.com/andreyvit/diff"
@@ -1176,3 +1177,36 @@ func TestLinkedServiceCalculator(t *testing.T) {
 		})
 	}
 }
+
+func TestGenerateDeploymentTemplate_ErrorHandling(t *testing.T) {
+	// Test that errors from generatePodTemplateSpec are properly propagated
+	buildValues := generator.BuildValues{
+		Project:         "test-project",
+		Environment:     "test-env",
+		EnvironmentType: "production",
+		Namespace:       "test-namespace",
+		Branch:          "main",
+		GitSHA:          "abcd1234",
+		LagoonVersion:   "v2.0.0",
+		Kubernetes:      "local",
+		Services: []generator.ServiceValues{
+			{
+				Name:         "nginx",
+				OverrideName: "nginx",
+				Type:         "nginx",
+			},
+		},
+		// Intentionally missing ImageReferences to trigger error
+		ImageReferences: map[string]string{},
+	}
+
+	_, err := GenerateDeploymentTemplate(buildValues)
+	if err == nil {
+		t.Error("GenerateDeploymentTemplate() should return error when image reference is missing")
+	}
+
+	expectedErrMsg := "couldn't generate deployment template for service nginx"
+	if err != nil && !strings.Contains(err.Error(), expectedErrMsg) {
+		t.Errorf("GenerateDeploymentTemplate() error = %v, want error containing %v", err, expectedErrMsg)
+	}
+}