Fix problems and adding functionnalities

Many fixes and enhancements:

- Add icon option
- Add env file managment
- Ordering compose parsing options
- Fix path with underscores
- Fix image and tag discovery
- Better documentation for labels

generator/generator.go

@@ -162,49 +162,6 @@ func Generate(project *types.Project) (*HelmChart, error) {
 	return chart, nil
 }
 
-// computeNIndentm replace all __indent__ labels with the number of spaces before the label.
-func computeNIndent(b []byte) []byte {
-	lines := bytes.Split(b, []byte("\n"))
-	for i, line := range lines {
-		if !bytes.Contains(line, []byte("__indent__")) {
-			continue
-		}
-		startSpaces := ""
-		spaces := regexp.MustCompile(`^\s+`).FindAllString(string(line), -1)
-		if len(spaces) > 0 {
-			startSpaces = spaces[0]
-		}
-		line = []byte(startSpaces + strings.TrimLeft(string(line), " "))
-		line = bytes.ReplaceAll(line, []byte("__indent__"), []byte(fmt.Sprintf("%d", len(startSpaces))))
-		lines[i] = line
-	}
-	return bytes.Join(lines, []byte("\n"))
-}
-
-// removeReplaceString replace all __replace_ labels with the value of the
-// capture group and remove all new lines and repeated spaces.
-//
-// we created:
-//
-//	__replace_bar: '{{ include "foo.labels" .
-//	   }}'
-//
-// note the new line and spaces...
-//
-// we now want to replace it with {{ include "foo.labels" . }}, without the label name.
-func removeReplaceString(b []byte) []byte {
-	// replace all matches with the value of the capture group
-	// and remove all new lines and repeated spaces
-	b = replaceLabelRegexp.ReplaceAllFunc(b, func(b []byte) []byte {
-		inc := replaceLabelRegexp.FindSubmatch(b)[1]
-		inc = bytes.ReplaceAll(inc, []byte("\n"), []byte(""))
-		inc = bytes.ReplaceAll(inc, []byte("\r"), []byte(""))
-		inc = regexp.MustCompile(`\s+`).ReplaceAll(inc, []byte(" "))
-		return inc
-	})
-	return b
-}
-
 // serviceIsMain returns true if the service is the main app.
 func serviceIsMain(service types.ServiceConfig) bool {
 	if main, ok := service.Labels[LabelMainApp]; ok {
@@ -213,37 +170,6 @@ func serviceIsMain(service types.ServiceConfig) bool {
 	return false
 }
 
-// buildVolumes creates the volumes for the service.
-func buildVolumes(service types.ServiceConfig, chart *HelmChart, deployments map[string]*Deployment) error {
-	appName := chart.Name
-	for _, v := range service.Volumes {
-		// Do not add volumes if the pod is injected in a deployments
-		// via "same-pod" and the volume in destination deployment exists
-		if samePodVolume(service, v, deployments) {
-			continue
-		}
-		switch v.Type {
-		case "volume":
-			pvc := NewVolumeClaim(service, v.Source, appName)
-
-			// if the service is integrated in another deployment, we need to add the volume
-			// to the target deployment
-			if override, ok := service.Labels[LabelSamePod]; ok {
-				pvc.nameOverride = override
-				pvc.Spec.StorageClassName = utils.StrPtr(`{{ .Values.` + override + `.persistence.` + v.Source + `.storageClass }}`)
-				chart.Values[override].(*Value).AddPersistence(v.Source)
-			}
-			y, _ := pvc.Yaml()
-			chart.Templates[pvc.Filename()] = &ChartTemplate{
-				Content:     y,
-				Servicename: service.Name,
-			}
-		}
-	}
-
-	return nil
-}
-
 func addStaticVolumes(deployments map[string]*Deployment, service types.ServiceConfig) {
 	// add the bound configMaps files to the deployment containers
 	var d *Deployment
@@ -292,6 +218,80 @@ func addStaticVolumes(deployments map[string]*Deployment, service types.ServiceC
 	d.Spec.Template.Spec.Containers[index] = *container
 }
 
+// computeNIndentm replace all __indent__ labels with the number of spaces before the label.
+func computeNIndent(b []byte) []byte {
+	lines := bytes.Split(b, []byte("\n"))
+	for i, line := range lines {
+		if !bytes.Contains(line, []byte("__indent__")) {
+			continue
+		}
+		startSpaces := ""
+		spaces := regexp.MustCompile(`^\s+`).FindAllString(string(line), -1)
+		if len(spaces) > 0 {
+			startSpaces = spaces[0]
+		}
+		line = []byte(startSpaces + strings.TrimLeft(string(line), " "))
+		line = bytes.ReplaceAll(line, []byte("__indent__"), []byte(fmt.Sprintf("%d", len(startSpaces))))
+		lines[i] = line
+	}
+	return bytes.Join(lines, []byte("\n"))
+}
+
+// removeReplaceString replace all __replace_ labels with the value of the
+// capture group and remove all new lines and repeated spaces.
+//
+// we created:
+//
+//	__replace_bar: '{{ include "foo.labels" .
+//	   }}'
+//
+// note the new line and spaces...
+//
+// we now want to replace it with {{ include "foo.labels" . }}, without the label name.
+func removeReplaceString(b []byte) []byte {
+	// replace all matches with the value of the capture group
+	// and remove all new lines and repeated spaces
+	b = replaceLabelRegexp.ReplaceAllFunc(b, func(b []byte) []byte {
+		inc := replaceLabelRegexp.FindSubmatch(b)[1]
+		inc = bytes.ReplaceAll(inc, []byte("\n"), []byte(""))
+		inc = bytes.ReplaceAll(inc, []byte("\r"), []byte(""))
+		inc = regexp.MustCompile(`\s+`).ReplaceAll(inc, []byte(" "))
+		return inc
+	})
+	return b
+}
+
+// buildVolumes creates the volumes for the service.
+func buildVolumes(service types.ServiceConfig, chart *HelmChart, deployments map[string]*Deployment) error {
+	appName := chart.Name
+	for _, v := range service.Volumes {
+		// Do not add volumes if the pod is injected in a deployments
+		// via "same-pod" and the volume in destination deployment exists
+		if samePodVolume(service, v, deployments) {
+			continue
+		}
+		switch v.Type {
+		case "volume":
+			pvc := NewVolumeClaim(service, v.Source, appName)
+
+			// if the service is integrated in another deployment, we need to add the volume
+			// to the target deployment
+			if override, ok := service.Labels[LabelSamePod]; ok {
+				pvc.nameOverride = override
+				pvc.Spec.StorageClassName = utils.StrPtr(`{{ .Values.` + override + `.persistence.` + v.Source + `.storageClass }}`)
+				chart.Values[override].(*Value).AddPersistence(v.Source)
+			}
+			y, _ := pvc.Yaml()
+			chart.Templates[pvc.Filename()] = &ChartTemplate{
+				Content:     y,
+				Servicename: service.Name,
+			}
+		}
+	}
+
+	return nil
+}
+
 // samePodVolume returns true if the volume is already in the target deployment.
 func samePodVolume(service types.ServiceConfig, v types.ServiceVolumeConfig, deployments map[string]*Deployment) bool {
 	// if the service has volumes, and it has "same-pod" label