Add more tests, refactor to fix problems

Signed-off-by: Patrice Ferlet <metal3d@gmail.com>

generator/deployment_test.go

@@ -5,16 +5,17 @@ import (
 	"testing"
 
 	v1 "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/yaml"
 )
 
 func TestGenerate(t *testing.T) {
-	_compose_file := `
+	compose_file := `
 services:
     web:
         image: nginx:1.29
 `
-	tmpDir := setup(_compose_file)
+	tmpDir := setup(compose_file)
 	defer teardown(tmpDir)
 
 	currentDir, _ := os.Getwd()
@@ -38,3 +39,99 @@ services:
 		t.Errorf("Expected image to be nginx:1.29, got %s", dt.Spec.Template.Spec.Containers[0].Image)
 	}
 }
+
+func TestGenerateOneDeploymentWithSamePod(t *testing.T) {
+	compose_file := `
+services:
+    web:
+        image: nginx:1.29
+        ports:
+        - 80:80
+
+    fpm:
+        image: php:fpm
+        ports:
+        - 9000:9000
+        labels:
+            katenary.v3/same-pod: web
+`
+
+	tmpDir := setup(compose_file)
+	defer teardown(tmpDir)
+
+	currentDir, _ := os.Getwd()
+	os.Chdir(tmpDir)
+	defer os.Chdir(currentDir)
+
+	output := _compile_test(t, "-s", "templates/web/deployment.yaml")
+	dt := v1.Deployment{}
+	if err := yaml.Unmarshal([]byte(output), &dt); err != nil {
+		t.Errorf(unmarshalError, err)
+	}
+
+	if len(dt.Spec.Template.Spec.Containers) != 2 {
+		t.Errorf("Expected 2 containers, got %d", len(dt.Spec.Template.Spec.Containers))
+	}
+	// endsure that the fpm service is not created
+
+	var err error
+	output, err = helmTemplate(ConvertOptions{
+		OutputDir: "./chart",
+	}, "-s", "templates/fpm/deployment.yaml")
+	if err == nil {
+		t.Errorf("Expected error, got nil")
+	}
+
+	// ensure that the web service is created and has got 2 ports
+	output, err = helmTemplate(ConvertOptions{
+		OutputDir: "./chart",
+	}, "-s", "templates/web/service.yaml")
+	if err != nil {
+		t.Errorf("Error: %s", err)
+	}
+	service := corev1.Service{}
+	if err := yaml.Unmarshal([]byte(output), &service); err != nil {
+		t.Errorf(unmarshalError, err)
+	}
+
+	if len(service.Spec.Ports) != 2 {
+		t.Errorf("Expected 2 ports, got %d", len(service.Spec.Ports))
+	}
+}
+
+func TestDependsOn(t *testing.T) {
+	compose_file := `
+services:
+    web:
+        image: nginx:1.29
+        ports:
+        - 80:80
+        depends_on:
+        - database
+
+    database:
+        image: mariadb:10.5
+        ports:
+        - 3306:3306
+`
+	tmpDir := setup(compose_file)
+	defer teardown(tmpDir)
+
+	currentDir, _ := os.Getwd()
+	os.Chdir(tmpDir)
+	defer os.Chdir(currentDir)
+
+	output := _compile_test(t, "-s", "templates/web/deployment.yaml")
+	dt := v1.Deployment{}
+	if err := yaml.Unmarshal([]byte(output), &dt); err != nil {
+		t.Errorf(unmarshalError, err)
+	}
+
+	if len(dt.Spec.Template.Spec.Containers) != 1 {
+		t.Errorf("Expected 1 container, got %d", len(dt.Spec.Template.Spec.Containers))
+	}
+	// find an init container
+	if len(dt.Spec.Template.Spec.InitContainers) != 1 {
+		t.Errorf("Expected 1 init container, got %d", len(dt.Spec.Template.Spec.InitContainers))
+	}
+}