Fix OCI env cache keying

Signed-off-by: Evan Lezar <elezar@nvidia.com>

Author: elezar

internal/ociedit/spec_editor.go

@@ -67,6 +67,7 @@ type nativeSpecEditor struct {
 func createEnvCacheMap(env []string) map[string]int {
 	envMap := make(map[string]int, len(env))
 	for i, val := range env {
+		val, _, _ = strings.Cut(val, "=")
 		envMap[val] = i
 	}
 	return envMap

pkg/cdi/container-edits_test.go

@@ -415,7 +415,7 @@ func TestApplyContainerEdits(t *testing.T) {
 			},
 		},
 		{
-			name: "non-empty spec, env var with existing key is appended",
+			name: "non-empty spec, env var with existing key is replaced",
 			spec: &oci.Spec{
 				Process: &oci.Process{
 					Env: []string{
@@ -432,9 +432,8 @@ func TestApplyContainerEdits(t *testing.T) {
 			result: &oci.Spec{
 				Process: &oci.Process{
 					Env: []string{
-						"FOO=old",
-						"BAR=old",
 						"FOO=new",
+						"BAR=old",
 					},
 				},
 			},