feat: support interpolation in <job>.container.options (#1958)

eliandoran · web-flow · commit 19764bcb06ac · 2023-09-12T06:35:25.000-07:00
diff --git a/pkg/runner/run_context.go b/pkg/runner/run_context.go
@@ -518,14 +518,14 @@ func (rc *RunContext) platformImage(ctx context.Context) string {
 	return rc.runsOnImage(ctx)
 }
 
-func (rc *RunContext) options(_ context.Context) string {
+func (rc *RunContext) options(ctx context.Context) string {
 	job := rc.Run.Job()
 	c := job.Container()
-	if c == nil {
-		return rc.Config.ContainerOptions
+	if c != nil {
+		return rc.ExprEval.Interpolate(ctx, c.Options)
 	}
 
-	return c.Options
+	return rc.Config.ContainerOptions
 }
 
 func (rc *RunContext) isEnabled(ctx context.Context) (bool, error) {

Original file line number	Diff line number	Diff line change
`@@ -518,14 +518,14 @@ func (rc *RunContext) platformImage(ctx context.Context) string {`
`518`	`518`	`return rc.runsOnImage(ctx)`
`519`	`519`	`}`
`520`	`520`
`521`		`-func (rc *RunContext) options(_ context.Context) string {`
	`521`	`+func (rc *RunContext) options(ctx context.Context) string {`
`522`	`522`	`job := rc.Run.Job()`
`523`	`523`	`c := job.Container()`
`524`		`- if c == nil {`
`525`		`- return rc.Config.ContainerOptions`
	`524`	`+ if c != nil {`
	`525`	`+ return rc.ExprEval.Interpolate(ctx, c.Options)`
`526`	`526`	`}`
`527`	`527`
`528`		`- return c.Options`
	`528`	`+ return rc.Config.ContainerOptions`
`529`	`529`	`}`
`530`	`530`
`531`	`531`	`func (rc *RunContext) isEnabled(ctx context.Context) (bool, error) {`