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.

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

TEP-0118: Add validation for matrix pipeline context parameter variables #6238

Merged

Conversation

EmmaMunley
Copy link
Contributor

@EmmaMunley EmmaMunley commented Feb 27, 2023

[TEP-0090: Matrix] introduced Matrix to the PipelineTask specification such that the PipelineTask executes a list of TaskRuns or Runs in parallel with the specified list of inputs for a Parameter or with different combinations of the inputs for a set of Parameters.

To build on this TEP-0018 introduced Matrix.Include, which allows passing in a specific combinations of Parameters into the Matrix.

This PR validates that matrix pipeline context parameter variables including include params are used appropriately.

Note: This is still in preview mode. Other forms of validation and implementation logic will be added in subsequent commits.

/kind feature

Submitter Checklist

As the author of this PR, please check off the items in this checklist:

  • Has Docs included if any changes are user facing
  • Has Tests included if any functionality added or changed
  • Follows the commit message standard
  • Meets the Tekton contributor standards (including
    functionality, content, code)
  • Has a kind label. You can add one by adding a comment on this PR that contains /kind <type>. Valid types are bug, cleanup, design, documentation, feature, flake, misc, question, tep
  • Release notes block below has been updated with any user facing changes (API changes, bug fixes, changes requiring upgrade notices or deprecation warnings)
  • Release notes contains the string "action required" if the change requires additional action from users switching to the new release

Release Notes

NONE

@tekton-robot tekton-robot added release-note-none Denotes a PR that doesnt merit a release note. kind/feature Categorizes issue or PR as related to a new feature. labels Feb 27, 2023
@tekton-robot tekton-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Feb 27, 2023
@tekton-robot
Copy link
Collaborator

The following is the coverage report on the affected files.
Say /test pull-tekton-pipeline-go-coverage to re-run this coverage report

File Old Coverage New Coverage Delta
pkg/apis/pipeline/v1/param_types.go 98.3% 98.3% 0.1
pkg/apis/pipeline/v1/pipeline_validation.go 99.4% 99.5% 0.0
pkg/apis/pipeline/v1beta1/param_types.go 98.2% 98.3% 0.1
pkg/apis/pipeline/v1beta1/pipeline_validation.go 99.6% 99.6% 0.0

@tekton-robot
Copy link
Collaborator

The following is the coverage report on the affected files.
Say /test pull-tekton-pipeline-go-coverage-df to re-run this coverage report

File Old Coverage New Coverage Delta
pkg/apis/pipeline/v1/param_types.go 98.3% 98.3% 0.1
pkg/apis/pipeline/v1/pipeline_validation.go 99.4% 99.5% 0.0
pkg/apis/pipeline/v1beta1/param_types.go 98.2% 98.3% 0.1
pkg/apis/pipeline/v1beta1/pipeline_validation.go 99.6% 99.6% 0.0

Copy link
Member

@lbernick lbernick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks @EmmaMunley! it looks like your commit message/PR description describe the changes to context variable validation, but not param type validation. Can you update them to reflect all the changes in this PR?

pkg/apis/pipeline/v1/param_types.go Outdated Show resolved Hide resolved
pkg/apis/pipeline/v1/param_types.go Outdated Show resolved Hide resolved
pkg/apis/pipeline/v1/pipeline_validation_test.go Outdated Show resolved Hide resolved
pkg/apis/pipeline/v1/pipeline_validation_test.go Outdated Show resolved Hide resolved
@tekton-robot tekton-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Feb 28, 2023
@tekton-robot
Copy link
Collaborator

The following is the coverage report on the affected files.
Say /test pull-tekton-pipeline-go-coverage to re-run this coverage report

File Old Coverage New Coverage Delta
pkg/apis/pipeline/v1/pipeline_validation.go 99.4% 99.5% 0.0
pkg/apis/pipeline/v1beta1/pipeline_validation.go 99.6% 99.6% 0.0

@tekton-robot
Copy link
Collaborator

The following is the coverage report on the affected files.
Say /test pull-tekton-pipeline-go-coverage-df to re-run this coverage report

File Old Coverage New Coverage Delta
pkg/apis/pipeline/v1/pipeline_validation.go 99.4% 99.5% 0.0
pkg/apis/pipeline/v1beta1/pipeline_validation.go 99.6% 99.6% 0.0

@tekton-robot
Copy link
Collaborator

The following is the coverage report on the affected files.
Say /test pull-tekton-pipeline-go-coverage to re-run this coverage report

File Old Coverage New Coverage Delta
pkg/apis/pipeline/v1/pipeline_validation.go 99.4% 99.5% 0.0
pkg/apis/pipeline/v1beta1/pipeline_validation.go 99.6% 99.6% 0.0

@tekton-robot
Copy link
Collaborator

The following is the coverage report on the affected files.
Say /test pull-tekton-pipeline-go-coverage-df to re-run this coverage report

File Old Coverage New Coverage Delta
pkg/apis/pipeline/v1/pipeline_validation.go 99.4% 99.5% 0.0
pkg/apis/pipeline/v1beta1/pipeline_validation.go 99.6% 99.6% 0.0

@EmmaMunley EmmaMunley requested review from lbernick and removed request for pritidesai February 28, 2023 13:57
@tekton-robot
Copy link
Collaborator

The following is the coverage report on the affected files.
Say /test pull-tekton-pipeline-go-coverage to re-run this coverage report

File Old Coverage New Coverage Delta
pkg/apis/pipeline/v1/pipeline_validation.go 99.4% 99.5% 0.0
pkg/apis/pipeline/v1beta1/pipeline_validation.go 99.6% 99.6% 0.0

@tekton-robot
Copy link
Collaborator

The following is the coverage report on the affected files.
Say /test pull-tekton-pipeline-go-coverage-df to re-run this coverage report

File Old Coverage New Coverage Delta
pkg/apis/pipeline/v1/pipeline_validation.go 99.4% 99.5% 0.0
pkg/apis/pipeline/v1beta1/pipeline_validation.go 99.6% 99.6% 0.0

@tekton-robot
Copy link
Collaborator

The following is the coverage report on the affected files.
Say /test pull-tekton-pipeline-go-coverage-df to re-run this coverage report

File Old Coverage New Coverage Delta
pkg/apis/pipeline/v1/pipeline_validation.go 99.4% 99.5% 0.0
pkg/apis/pipeline/v1beta1/pipeline_validation.go 99.6% 99.6% 0.0

@tekton-robot
Copy link
Collaborator

The following is the coverage report on the affected files.
Say /test pull-tekton-pipeline-go-coverage to re-run this coverage report

File Old Coverage New Coverage Delta
pkg/apis/pipeline/v1/pipeline_validation.go 99.4% 99.5% 0.0
pkg/apis/pipeline/v1beta1/pipeline_validation.go 99.6% 99.6% 0.0

…les include Matrix.Include.Params

[TEP-0090: Matrix] introduced `Matrix` to the `PipelineTask` specification such that the `PipelineTask` executes a list of `TaskRuns` or `Runs` in parallel with the specified list of inputs for a `Parameter` or with different combinations of the inputs for a set of `Parameters`.

To build on this, Tep-0018 introduced Matrix.Include, which allows passing in a specific combinations of `Parameters` into the `Matrix`.

This commit validates that matrix pipeline context  parameter variables including include params are used appropriately.

Note: This is still in preview mode. Other forms of validation and implementation logic will be added in subsequent commits.
@tekton-robot
Copy link
Collaborator

The following is the coverage report on the affected files.
Say /test pull-tekton-pipeline-go-coverage-df to re-run this coverage report

File Old Coverage New Coverage Delta
pkg/apis/pipeline/v1/pipeline_validation.go 99.4% 99.5% 0.0
pkg/apis/pipeline/v1beta1/pipeline_validation.go 99.6% 99.6% 0.0

@tekton-robot
Copy link
Collaborator

The following is the coverage report on the affected files.
Say /test pull-tekton-pipeline-go-coverage to re-run this coverage report

File Old Coverage New Coverage Delta
pkg/apis/pipeline/v1/pipeline_validation.go 99.4% 99.5% 0.0
pkg/apis/pipeline/v1beta1/pipeline_validation.go 99.6% 99.6% 0.0

@jerop jerop added this to the Pipelines v0.46 milestone Feb 28, 2023
Copy link
Member

@jerop jerop left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@EmmaMunley - Thanks for breaking this up into small PRs!

@tekton-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jerop

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@tekton-robot tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 28, 2023
@@ -184,13 +184,25 @@ func validatePipelineContextVariables(tasks []PipelineTask) *apis.FieldError {
var paramValues []string
for _, task := range tasks {
var matrixParams []Param
var includeParams []Param
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just having a discussion in other PR #6180, we could introduce a new type and use that instead of []Param:

type Params []Param

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a blocker for this PR though!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @EmmaMunley, please make sure to follow up on this once PR #6180 is resolved.

Comment on lines 196 to +205
for _, param := range append(task.Params, matrixParams...) {
paramValues = append(paramValues, param.Value.StringVal)
paramValues = append(paramValues, param.Value.ArrayVal...)
}

if task.Matrix.MatrixHasInclude() {
for _, param := range append(task.Params, includeParams...) {
paramValues = append(paramValues, param.Value.StringVal)
}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could leverage a common function retrieving values from params:

https://github.com/tektoncd/pipeline/pull/6180/files#diff-16493f3be05dfe9ce9d789d3b4b277f77d13deb8673084b3efe9034d20eb2987R121-R131

Also at this point in the execution, it must be safe to rely on this member function Params.extractParamValuesFromParams which is collecting values from an objects as well since we have a validation upfront for limiting such usage.

@pritidesai
Copy link
Member

/lgtm

Thank you @EmmaMunley 👍 Also, please highlight the changes in the PR description since it's a part of a bigger effort.

This PR validates that matrix pipeline context parameter variables including include params are used appropriately.

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 28, 2023
@tekton-robot tekton-robot merged commit adff467 into tektoncd:main Feb 28, 2023
EmmaMunley added a commit to EmmaMunley/pipeline that referenced this pull request Mar 2, 2023
[TEP-0090: Matrix] introduced `Matrix` to the `PipelineTask` specification such that the `PipelineTask` executes a list of `TaskRuns` or `Runs` in parallel with the specified list of inputs for a `Parameter` or with different combinations of the inputs for a set of `Parameters`.

To build on this, Tep-0018 introduced Matrix.Include, which allows passing in a specific combinations of `Parameters` into the `Matrix`.

**This commit adds isolated functionality testing for valid and invalid matrix context as a follow up to  tektoncd#6238.**

Note: This is still in preview mode. Implementation logic will be added in subsequent commits.
@EmmaMunley EmmaMunley deleted the validate-pipeline-context-vars branch March 7, 2023 15:26
EmmaMunley added a commit to EmmaMunley/pipeline that referenced this pull request Mar 8, 2023
[TEP-0090: Matrix] introduced `Matrix` to the `PipelineTask` specification such that the `PipelineTask` executes a list of `TaskRuns` or `Runs` in parallel with the specified list of inputs for a `Parameter` or with different combinations of the inputs for a set of `Parameters`.

To build on this, Tep-0018 introduced Matrix.Include, which allows passing in a specific combinations of `Parameters` into the `Matrix`.

**This commit adds isolated functionality testing for valid and invalid matrix context as a follow up to  tektoncd#6238.**

Note: This is still in preview mode. Implementation logic will be added in subsequent commits.
EmmaMunley added a commit to EmmaMunley/pipeline that referenced this pull request Mar 10, 2023
[TEP-0090: Matrix] introduced `Matrix` to the `PipelineTask` specification such that the `PipelineTask` executes a list of `TaskRuns` or `Runs` in parallel with the specified list of inputs for a `Parameter` or with different combinations of the inputs for a set of `Parameters`.

To build on this, Tep-0018 introduced Matrix.Include, which allows passing in a specific combinations of `Parameters` into the `Matrix`.

**This commit adds isolated functionality testing for valid and invalid matrix context as a follow up to  tektoncd#6238.**

Note: This is still in preview mode. Implementation logic will be added in subsequent commits.
EmmaMunley added a commit to EmmaMunley/pipeline that referenced this pull request Mar 10, 2023
[TEP-0090: Matrix] introduced `Matrix` to the `PipelineTask` specification such that the `PipelineTask` executes a list of `TaskRuns` or `Runs` in parallel with the specified list of inputs for a `Parameter` or with different combinations of the inputs for a set of `Parameters`.

To build on this, Tep-0018 introduced Matrix.Include, which allows passing in a specific combinations of `Parameters` into the `Matrix`.

**This commit adds isolated functionality testing for valid and invalid matrix context as a follow up to  tektoncd#6238.**

Note: This is still in preview mode. Implementation logic will be added in subsequent commits.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/feature Categorizes issue or PR as related to a new feature. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesnt merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants