Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: allow params from previous tasks results #1562

Merged
merged 2 commits into from
Jul 24, 2023
Merged

fix: allow params from previous tasks results #1562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d648372
fix: allow params from previous tasks results
JordanGoasdoue Jul 21, 2023
d2263d9
chore: add pipeline-params-from-tasks-results test
JordanGoasdoue Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 29 additions & 8 deletions pkg/triggerconfig/inrepo/params.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,37 @@ type UseLocation struct {
TaskSpec *v1beta1.TaskSpec
}

func getParamsFromTasksResults(loc *UseLocation) map[string]bool {
areParamsFromTasksResults := make(map[string]bool)
pipelineTasksAndFinally := loc.PipelineSpec.Tasks
pipelineTasksAndFinally = append(pipelineTasksAndFinally, loc.PipelineSpec.Finally...)
for _, pipelineTask := range pipelineTasksAndFinally {
params := pipelineTask.Params
for _, param := range params {
paramValStr := param.Value.StringVal
if strings.HasPrefix(paramValStr, "$(tasks.") && strings.Contains(paramValStr, ".results.") && strings.HasSuffix(paramValStr, ")") {
areParamsFromTasksResults[param.Name] = true
}
}
}
tomhobson marked this conversation as resolved.
Show resolved Hide resolved
return areParamsFromTasksResults
}

// UseParametersAndResults adds the parameters from the used Task to the PipelineSpec if specified and the PipelineTask
func UseParametersAndResults(ctx context.Context, loc *UseLocation, uses *v1beta1.TaskSpec) error {
parameterSpecs := uses.Params
parameters := ToParams(parameterSpecs)
results := uses.Results
areParamsFromTasksResults := getParamsFromTasksResults(loc)

prs := loc.PipelineRunSpec
if prs != nil {
prs.Params = useParameters(prs.Params, ToDefaultParams(parameterSpecs))
prs.Params = useParameters(prs.Params, ToDefaultParams(parameterSpecs), areParamsFromTasksResults)
prs.Workspaces = useWorkspaceBindings(prs.Workspaces, ToWorkspaceBindings(uses.Workspaces))
}
ps := loc.PipelineSpec
if ps != nil {
ps.Params = useParameterSpecs(ctx, ps.Params, parameterSpecs)
ps.Params = useParameterSpecs(ctx, ps.Params, parameterSpecs, areParamsFromTasksResults)
ps.Results = usePipelineResults(ps.Results, results, loc.TaskName)
ps.Workspaces = usePipelineWorkspaces(ps.Workspaces, uses.Workspaces)
}
Expand All @@ -43,11 +60,11 @@ func UseParametersAndResults(ctx context.Context, loc *UseLocation, uses *v1beta
}
trs := loc.TaskRunSpec
if trs != nil {
trs.Params = useParameters(trs.Params, parameters)
trs.Params = useParameters(trs.Params, parameters, areParamsFromTasksResults)
}
ts := loc.TaskSpec
if ts != nil {
ts.Params = useParameterSpecs(ctx, ts.Params, parameterSpecs)
ts.Params = useParameterSpecs(ctx, ts.Params, parameterSpecs, areParamsFromTasksResults)
ts.Results = useResults(ts.Results, results)
ts.Sidecars = useSidecars(ts.Sidecars, uses.Sidecars)
ts.Workspaces = useWorkspaces(ts.Workspaces, uses.Workspaces)
Expand Down Expand Up @@ -89,7 +106,7 @@ func ToDefaultParams(params []v1beta1.ParamSpec) []v1beta1.Param {
return answer
}

func useParameterSpecs(ctx context.Context, params []v1beta1.ParamSpec, uses []v1beta1.ParamSpec) []v1beta1.ParamSpec {
func useParameterSpecs(ctx context.Context, params []v1beta1.ParamSpec, uses []v1beta1.ParamSpec, areParamsFromTasksResults map[string]bool) []v1beta1.ParamSpec {
for _, u := range uses {
found := false
for i := range params {
Expand All @@ -105,13 +122,15 @@ func useParameterSpecs(ctx context.Context, params []v1beta1.ParamSpec, uses []v
}
if !found {
u.SetDefaults(ctx)
params = append(params, u)
if areParamsFromTasksResults == nil || !areParamsFromTasksResults[u.Name] {
params = append(params, u)
}
}
}
return params
}

func useParameters(params []v1beta1.Param, uses []v1beta1.Param) []v1beta1.Param {
func useParameters(params []v1beta1.Param, uses []v1beta1.Param, areParamsFromTasksResults map[string]bool) []v1beta1.Param {
for _, u := range uses {
found := false
for i := range params {
Expand All @@ -134,7 +153,9 @@ func useParameters(params []v1beta1.Param, uses []v1beta1.Param) []v1beta1.Param
}
}
if !found {
params = append(params, u)
if areParamsFromTasksResults == nil || !areParamsFromTasksResults[u.Name] {
params = append(params, u)
}
}
}
return params
Expand Down
Loading