also drop util.RightJoinMap

Signed-off-by: Jason Hall <[email protected]>
chainguard-dev · Dec 13, 2024 · 0408191 · 0408191
1 parent 1b75e72
commit 0408191
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 34 deletions.
diff --git a/pkg/build/compile.go b/pkg/build/compile.go
@@ -245,7 +245,9 @@ func (c *Compiled) compilePipeline(ctx context.Context, sm *SubstitutionMap, pip
 	}
 
 	if parent != nil {
-		with = util.RightJoinMap(parent, with)
+		m := maps.Clone(parent)
+		maps.Copy(m, with)
+		with = m
 	}
 
 	validated, err := validateWith(with, pipeline.Inputs)

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -1220,7 +1220,9 @@ func (p *Pipeline) propagateChildPipelines() {
 			p.Pipeline[idx].WorkDir = p.WorkDir
 		}
 
-		p.Pipeline[idx].Environment = util.RightJoinMap(p.Environment, p.Pipeline[idx].Environment)
+		m := maps.Clone(p.Environment)
+		maps.Copy(m, p.Pipeline[idx].Environment)
+		p.Pipeline[idx].Environment = = m
 
 		p.Pipeline[idx].propagateChildPipelines()
 	}

diff --git a/pkg/util/util.go b/pkg/util/util.go