Fixing updates

core/utils/routines.go

@@ -1,11 +1,34 @@
 package utils
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
 	"reflect"
+	"strings"
 )
 
+func SetEviron(eviron []string, envs ...string) []string {
+	envMap := make(map[string]string)
+	for _, e := range eviron {
+		parts := strings.SplitN(e, "=", 2)
+		if len(parts) == 2 {
+			envMap[parts[0]] = parts[1]
+		}
+	}
+	for _, e := range envs {
+		parts := strings.SplitN(e, "=", 2)
+		if len(parts) == 2 {
+			envMap[parts[0]] = parts[1]
+		}
+	}
+	newEviron := make([]string, 0, len(envMap))
+	for k, v := range envMap {
+		newEviron = append(newEviron, fmt.Sprintf("%s=%s", k, v))
+	}
+
+	return newEviron
+}
 func CleanTempRuntimes(pattern string) error {
 	matches, err := filepath.Glob(pattern)
 	if err != nil {
@@ -42,7 +65,7 @@ func ExistsMatchingDirs(pattern, exclude string) (bool, error) {
 	return false, nil
 }
 
-func IndexPaths(runDir string) (*map[string]string, error) {
+func IndexPaths(runDir string) (map[string]string, error) {
 	indexed := make(map[string]string)
 
 	err := filepath.Walk(runDir, func(path string, info os.FileInfo, err error) error {
@@ -67,7 +90,7 @@ func IndexPaths(runDir string) (*map[string]string, error) {
 		return nil, err
 	}
 
-	return &indexed, nil
+	return indexed, nil
 }
 
 func IsFullyInitialized(i any) bool {

core/utils/utils_test.go

@@ -0,0 +1,48 @@
+package utils
+
+import (
+	"fmt"
+	"reflect"
+	"sort"
+	"testing"
+)
+
+func TestFunc_SetEviron(t *testing.T) {
+	tests := []struct {
+		eviron []string
+		envs   []string
+		want   []string
+	}{
+		{
+			[]string{"ENV1=1", "ENV2=2", "ENV3=4"},
+			[]string{"ENV3=3"},
+			[]string{"ENV1=1", "ENV2=2", "ENV3=3"},
+		},
+		{
+			[]string{"ENV1=1", "ENV2=5", "ENV3=4"},
+			[]string{"ENV2=2", "ENV3=3"},
+			[]string{"ENV1=1", "ENV2=2", "ENV3=3"},
+		},
+		{
+			[]string{"ENV1=1", "ENV2=2", "ENV3=3"},
+			[]string{"ENV4=4"},
+			[]string{"ENV1=1", "ENV2=2", "ENV3=3", "ENV4=4"},
+		},
+		{
+			[]string{"ENV1=1", "ENV2=2", "ENV3=4"},
+			[]string{"ENV3=2", "ENV3=3"},
+			[]string{"ENV1=1", "ENV2=2", "ENV3=3"},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(fmt.Sprintf("in %q set new %q", tt.eviron, tt.envs), func(t *testing.T) {
+			got := SetEviron(tt.eviron, tt.envs...)
+			sort.Strings(got)
+			sort.Strings(tt.want)
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("SetEviron(%q, %q) = got %v; want %v", tt.eviron, tt.envs, got, tt.want)
+			}
+		})
+	}
+}

core/utils/uuid.go

@@ -26,15 +26,15 @@ func NewUUID(length int) (string, error) {
 }
 
 func NewUUID32() (string, error) {
-	return NewUUID(config.GetInternalConsts().GetUUIDLength())
+	return NewUUID(config.UUIDLength)
 }
 
 func NewUUID32Raw() ([]byte, error) {
-	data, err := NewUUIDRaw(config.GetInternalConsts().GetUUIDLength())
+	data, err := NewUUIDRaw(config.UUIDLength)
 	if err != nil {
 		return data, err
 	}
-	if len(data) != config.GetInternalConsts().GetUUIDLength() {
+	if len(data) != config.UUIDLength {
 		return data, errors.New("unexpected UUID length")
 	}
 	return data, nil