From e0c18ec2adf26cb719e40a9e461281e21797338f Mon Sep 17 00:00:00 2001
From: Patrice Ferlet <metal3d@gmail.com>
Date: Tue, 23 Apr 2024 15:45:31 +0200
Subject: [PATCH] Avoid repetitions

---
 generator/configMap_test.go  | 2 +-
 generator/deployment_test.go | 2 +-
 generator/ingress_test.go    | 2 +-
 generator/secret_test.go     | 2 +-
 generator/service_test.go    | 2 +-
 generator/tools_test.go      | 2 ++
 generator/volume_test.go     | 6 +++---
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/generator/configMap_test.go b/generator/configMap_test.go
index 29fc922..6a29373 100644
--- a/generator/configMap_test.go
+++ b/generator/configMap_test.go
@@ -27,7 +27,7 @@ services:
 	output := _compile_test(t, "-s", "templates/web/configmap.yaml")
 	configMap := v1.ConfigMap{}
 	if err := yaml.Unmarshal([]byte(output), &configMap); err != nil {
-		t.Errorf("Failed to unmarshal the output: %s", err)
+		t.Errorf(unmarshalError, err)
 	}
 	data := configMap.Data
 	if len(data) != 2 {
diff --git a/generator/deployment_test.go b/generator/deployment_test.go
index ba0a1d6..f9df258 100644
--- a/generator/deployment_test.go
+++ b/generator/deployment_test.go
@@ -26,7 +26,7 @@ services:
 	// dt := DeploymentTest{}
 	dt := v1.Deployment{}
 	if err := yaml.Unmarshal([]byte(output), &dt); err != nil {
-		t.Errorf("Failed to unmarshal the output: %s", err)
+		t.Errorf(unmarshalError, err)
 	}
 
 	if *dt.Spec.Replicas != 1 {
diff --git a/generator/ingress_test.go b/generator/ingress_test.go
index 0e05b93..ccdc080 100644
--- a/generator/ingress_test.go
+++ b/generator/ingress_test.go
@@ -33,7 +33,7 @@ services:
 	output := _compile_test(t, "-s", "templates/web/ingress.yaml", "--set", "web.ingress.enabled=true")
 	ingress := v1.Ingress{}
 	if err := yaml.Unmarshal([]byte(output), &ingress); err != nil {
-		t.Errorf("Failed to unmarshal the output: %s", err)
+		t.Errorf(unmarshalError, err)
 	}
 	if len(ingress.Spec.Rules) != 1 {
 		t.Errorf("Expected 1 rule, got %d", len(ingress.Spec.Rules))
diff --git a/generator/secret_test.go b/generator/secret_test.go
index 1399a0c..fb30ebb 100644
--- a/generator/secret_test.go
+++ b/generator/secret_test.go
@@ -32,7 +32,7 @@ services:
 	output := _compile_test(t, "-s", "templates/web/secret.yaml")
 	secret := v1.Secret{}
 	if err := yaml.Unmarshal([]byte(output), &secret); err != nil {
-		t.Errorf("Failed to unmarshal the output: %s", err)
+		t.Errorf(unmarshalError, err)
 	}
 	data := secret.Data
 	if len(data) != 1 {
diff --git a/generator/service_test.go b/generator/service_test.go
index 4b5ab24..1bc7a89 100644
--- a/generator/service_test.go
+++ b/generator/service_test.go
@@ -27,7 +27,7 @@ services:
 	output := _compile_test(t, "-s", "templates/web/service.yaml")
 	service := v1.Service{}
 	if err := yaml.Unmarshal([]byte(output), &service); err != nil {
-		t.Errorf("Failed to unmarshal the output: %s", err)
+		t.Errorf(unmarshalError, err)
 	}
 
 	if len(service.Spec.Ports) != 2 {
diff --git a/generator/tools_test.go b/generator/tools_test.go
index 7d8caad..b0fd7fa 100644
--- a/generator/tools_test.go
+++ b/generator/tools_test.go
@@ -9,6 +9,8 @@ import (
 	"katenary/parser"
 )
 
+const unmarshalError = "Failed to unmarshal the output: %s"
+
 func setup(content string) string {
 	// write the _compose_file in temporary directory
 	tmpDir, err := os.MkdirTemp("", "katenary")
diff --git a/generator/volume_test.go b/generator/volume_test.go
index a0320eb..86659a8 100644
--- a/generator/volume_test.go
+++ b/generator/volume_test.go
@@ -31,7 +31,7 @@ volumes:
 
 	dt := v1.Deployment{}
 	if err := yaml.Unmarshal([]byte(output), &dt); err != nil {
-		t.Errorf("Failed to unmarshal the output: %s", err)
+		t.Errorf(unmarshalError, err)
 	}
 
 	if dt.Spec.Template.Spec.Containers[0].VolumeMounts[0].Name != "data" {
@@ -71,7 +71,7 @@ services:
 	output := _compile_test(t, "-s", "templates/web/deployment.yaml")
 	dt := v1.Deployment{}
 	if err := yaml.Unmarshal([]byte(output), &dt); err != nil {
-		t.Errorf("Failed to unmarshal the output: %s", err)
+		t.Errorf(unmarshalError, err)
 	}
 	// get the volume mount path
 	volumeMountPath := dt.Spec.Template.Spec.Containers[0].VolumeMounts[0].MountPath
@@ -88,7 +88,7 @@ services:
 	}
 	configMap := corev1.ConfigMap{}
 	if err := yaml.Unmarshal([]byte(output), &configMap); err != nil {
-		t.Errorf("Failed to unmarshal the output: %s", err)
+		t.Errorf(unmarshalError, err)
 	}
 	data := configMap.Data
 	if len(data) != 1 {