Merge pull request #1445 from jonjohnsonjr/range-replacer-pipeline

Replace "needs" in range pipelines
chainguard-dev · Aug 20, 2024 · 98b252c · 98b252c
2 parents 2dbb223 + 83a46dc
commit 98b252c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -777,6 +777,15 @@ func replaceAll(r *strings.Replacer, in []string) []string {
 	return out
 }
 
+func replaceNeeds(r *strings.Replacer, in *Needs) *Needs {
+	if in == nil {
+		return nil
+	}
+	return &Needs{
+		Packages: replaceAll(r, in.Packages),
+	}
+}
+
 // propagateChildPipelines performs downward propagation of configuration values.
 func (p *Pipeline) propagateChildPipelines() {
 	for idx := range p.Pipeline {
@@ -943,7 +952,7 @@ func ParseConfiguration(ctx context.Context, configurationFilePath string, opts
 					Uses:    p.Uses,
 					With:    replacedWith,
 					Inputs:  p.Inputs,
-					Needs:   p.Needs,
+					Needs:   replaceNeeds(replacer, p.Needs),
 					Label:   p.Label,
 					Runs:    replacer.Replace(p.Runs),
 					WorkDir: replacer.Replace(p.WorkDir),
@@ -969,7 +978,7 @@ func ParseConfiguration(ctx context.Context, configurationFilePath string, opts
 						Uses:    p.Uses,
 						With:    replacedWith,
 						Inputs:  p.Inputs,
-						Needs:   p.Needs,
+						Needs:   replaceNeeds(replacer, p.Needs),
 						Label:   p.Label,
 						Runs:    replacer.Replace(p.Runs),
 						WorkDir: replacer.Replace(p.WorkDir),

diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
@@ -182,7 +182,10 @@ subpackages:
       runtime:
         - wow-some-kinda-dynamically-linked-library-i-guess=1.0
     pipeline:
-      - working-directory: ${{vars.buildLocation}}/subdir/${{range.key}}/${{range.value}}
+      - needs:
+          packages:
+            - ${{range.key}}
+        working-directory: ${{vars.buildLocation}}/subdir/${{range.key}}/${{range.value}}
         runs: |
           echo "$PWD"
 `), 0644); err != nil {
@@ -196,6 +199,8 @@ subpackages:
 	require.Equal(t, cfg.Subpackages[0].Dependencies.ReplacesPriority, "10")
 	require.Equal(t, cfg.Subpackages[0].Pipeline[0].WorkDir, "/home/build/foo/subdir/a/10")
 	require.Equal(t, cfg.Subpackages[1].Pipeline[0].WorkDir, "/home/build/foo/subdir/b/20")
+	require.Equal(t, cfg.Subpackages[0].Pipeline[0].Needs.Packages[0], "a")
+	require.Equal(t, cfg.Subpackages[1].Pipeline[0].Needs.Packages[0], "b")
 }
 
 func Test_propagatePipelines(t *testing.T) {