WIP: Some refactoring

pkg/release/release.go

@@ -2,6 +2,7 @@ package release
 
 import (
 	"fmt"
+	"path/filepath"
 	"reflect"
 	"strings"
 
@@ -30,6 +31,14 @@ type Release struct {
 	// Private fields that should be pupulated during the run-time
 	RepositoryObj      *repository.Repository `yaml:"-"`
 	UnencryptedSecrets map[string][]byte      `yaml:"-"`
+	DestValues         []ValuesHolder         `yaml:"-"`
+	DestSecrets        []string               `yaml:"-"`
+}
+
+type ValuesHolder struct {
+	SrcPath  string
+	DestPath string
+	Data     []byte
 }
 
 type Releases []*Release
@@ -74,6 +83,11 @@ func (r *Release) VersionHandler(dir string, hh helmhelper.Helmhelper) error {
 func (r *Release) ValuesHandler(dir string) {
 	for i := range r.Values {
 		r.Values[i] = fmt.Sprintf("%s/%s", dir, strings.ReplaceAll(r.Values[i], "./", ""))
+		destValues := fmt.Sprintf("%s-%s-%s", r.Namespace, r.Release, filepath.Base(r.Values[i]))
+		r.DestValues = append(r.DestValues, ValuesHolder{
+			SrcPath:  r.Values[i],
+			DestPath: destValues,
+		})
 	}
 }
 
@@ -84,6 +98,8 @@ func (r *Release) SecretsHandler(dir string, sops sopshelper.SopsHelper) error {
 		if err != nil {
 			return err
 		}
+		destSecrets := fmt.Sprintf("%s-%s-%s", r.Namespace, r.Release, filepath.Base(r.Secrets[i]))
+		r.DestSecrets = append(r.DestSecrets, destSecrets)
 		r.UnencryptedSecrets[path] = res
 	}
 	return nil
@@ -91,13 +107,15 @@ func (r *Release) SecretsHandler(dir string, sops sopshelper.SopsHelper) error {
 
 func FindReleaseByNames(releases []string, releasesObj Releases) Releases {
 	result := Releases{}
-	for _, rObj := range releasesObj {
-		for _, r := range releases {
-			if rObj.Release == r {
-				result = append(result, rObj)
+
+	for _, repoObj := range releasesObj {
+		for _, release := range releases {
+			if repoObj.Release == release {
+				result = append(result, repoObj)
 			}
 		}
 	}
+
 	return result
 }
 
@@ -135,6 +153,8 @@ func (r *Release) LockEntry() *lockfile.LockEntry {
 		Namespace: r.Namespace,
 		RepoUrl:   r.RepositoryObj.URL,
 		RepoName:  r.RepositoryObj.Name,
+		Values:    r.DestValues,
+		Secrets:   r.DestSecrets,
 	}
 }