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

Split up and refactor isCustomTask #6447

Merged
merged 1 commit into from
Mar 30, 2023
Merged

Conversation

jerop
Copy link
Member

@jerop jerop commented Mar 28, 2023

Changes

In this change, we clean up the isCustomTask function:

  • Remove unused context.Context.
  • Remove the check that either TaskRef or TaskSpec is specified because we check that way before - see code.
  • Define the check that TaskRef is a CustomTask as a member function of TaskRef; and add tests for the member function.
  • Define the check that TaskSpec is a CustomTask as a member function of TaskSpec; and add tests for the member function.
  • Update the docstring for Kind and APIVersion in TaskRef.

There are no user-facing changes in this commit.

From this cleanup, there are two issues that have been raised that will be addressed separately:

/kind cleanup

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/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. labels Mar 28, 2023
@tekton-robot tekton-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Mar 28, 2023
@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/v1beta1/pipeline_types.go 96.5% 96.5% 0.0
pkg/apis/pipeline/v1beta1/taskref_types.go Do not exist 100.0%
pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go 96.0% 95.9% -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_types.go 97.1% 97.1% 0.0
pkg/apis/pipeline/v1/taskref_types.go Do not exist 100.0%
pkg/apis/pipeline/v1beta1/pipeline_types.go 96.5% 96.5% 0.0
pkg/apis/pipeline/v1beta1/taskref_types.go Do not exist 100.0%
pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go 96.0% 95.9% -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_types.go 97.1% 97.1% 0.0
pkg/apis/pipeline/v1/taskref_types.go Do not exist 100.0%
pkg/apis/pipeline/v1beta1/pipeline_types.go 96.5% 96.5% 0.0
pkg/apis/pipeline/v1beta1/taskref_types.go Do not exist 100.0%
pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go 96.0% 95.9% -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_types.go 97.1% 97.1% 0.0
pkg/apis/pipeline/v1/taskref_types.go Do not exist 100.0%
pkg/apis/pipeline/v1beta1/pipeline_types.go 96.5% 96.5% 0.0
pkg/apis/pipeline/v1beta1/taskref_types.go Do not exist 100.0%
pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go 96.0% 95.9% -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_types.go 97.1% 97.1% 0.0
pkg/apis/pipeline/v1/taskref_types.go Do not exist 100.0%
pkg/apis/pipeline/v1beta1/pipeline_types.go 96.5% 96.5% 0.0
pkg/apis/pipeline/v1beta1/taskref_types.go Do not exist 100.0%
pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go 96.0% 95.9% -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_types.go 97.1% 97.1% 0.0
pkg/apis/pipeline/v1/taskref_types.go Do not exist 100.0%
pkg/apis/pipeline/v1beta1/pipeline_types.go 96.5% 96.5% 0.0
pkg/apis/pipeline/v1beta1/taskref_types.go Do not exist 100.0%
pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go 96.0% 95.9% -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_types.go 97.1% 97.1% 0.0
pkg/apis/pipeline/v1/taskref_types.go Do not exist 100.0%
pkg/apis/pipeline/v1beta1/pipeline_types.go 96.5% 96.5% 0.0
pkg/apis/pipeline/v1beta1/taskref_types.go Do not exist 100.0%
pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go 96.0% 95.9% -0.0

@jerop
Copy link
Member Author

jerop commented Mar 28, 2023

flake #4169

/retest

@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_types.go 97.1% 97.1% 0.0
pkg/apis/pipeline/v1/taskref_types.go Do not exist 100.0%
pkg/apis/pipeline/v1beta1/pipeline_types.go 96.5% 96.5% 0.0
pkg/apis/pipeline/v1beta1/taskref_types.go Do not exist 100.0%
pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go 96.0% 95.9% -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_types.go 97.1% 97.1% 0.0
pkg/apis/pipeline/v1/taskref_types.go Do not exist 100.0%
pkg/apis/pipeline/v1beta1/pipeline_types.go 96.5% 96.5% 0.0
pkg/apis/pipeline/v1beta1/taskref_types.go Do not exist 100.0%
pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go 96.0% 95.9% -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_types.go 97.1% 97.1% 0.0
pkg/apis/pipeline/v1/taskref_types.go Do not exist 100.0%
pkg/apis/pipeline/v1beta1/pipeline_types.go 96.5% 96.5% 0.0
pkg/apis/pipeline/v1beta1/taskref_types.go Do not exist 100.0%
pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go 96.0% 95.9% -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_types.go 97.1% 97.1% 0.0
pkg/apis/pipeline/v1/taskref_types.go Do not exist 100.0%
pkg/apis/pipeline/v1beta1/pipeline_types.go 96.5% 96.5% 0.0
pkg/apis/pipeline/v1beta1/taskref_types.go Do not exist 100.0%
pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go 96.0% 95.9% -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_types.go 97.1% 97.1% 0.0
pkg/apis/pipeline/v1/taskref_types.go Do not exist 100.0%
pkg/apis/pipeline/v1beta1/pipeline_types.go 96.5% 96.5% 0.0
pkg/apis/pipeline/v1beta1/taskref_types.go Do not exist 100.0%
pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go 96.0% 95.9% -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_types.go 97.1% 97.1% 0.0
pkg/apis/pipeline/v1/taskref_types.go Do not exist 100.0%
pkg/apis/pipeline/v1beta1/pipeline_types.go 96.5% 96.5% 0.0
pkg/apis/pipeline/v1beta1/taskref_types.go Do not exist 100.0%
pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go 96.0% 95.9% -0.0

@jerop jerop mentioned this pull request Mar 29, 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_types.go 97.1% 97.1% 0.0
pkg/apis/pipeline/v1/taskref_types.go Do not exist 100.0%
pkg/apis/pipeline/v1beta1/pipeline_types.go 96.5% 96.5% 0.0
pkg/apis/pipeline/v1beta1/taskref_types.go Do not exist 100.0%
pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go 96.0% 95.9% -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_types.go 97.1% 97.1% 0.0
pkg/apis/pipeline/v1/taskref_types.go Do not exist 100.0%
pkg/apis/pipeline/v1beta1/pipeline_types.go 96.5% 96.5% 0.0
pkg/apis/pipeline/v1beta1/taskref_types.go Do not exist 100.0%
pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go 96.0% 95.9% -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_types.go 97.1% 97.1% 0.0
pkg/apis/pipeline/v1/taskref_types.go Do not exist 100.0%
pkg/apis/pipeline/v1beta1/pipeline_types.go 96.5% 96.5% 0.0
pkg/apis/pipeline/v1beta1/taskref_types.go Do not exist 100.0%
pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go 96.0% 95.9% -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_types.go 97.1% 97.1% 0.0
pkg/apis/pipeline/v1/taskref_types.go Do not exist 100.0%
pkg/apis/pipeline/v1beta1/pipeline_types.go 96.5% 96.5% 0.0
pkg/apis/pipeline/v1beta1/taskref_types.go Do not exist 100.0%
pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go 96.0% 95.9% -0.0

@jerop jerop force-pushed the iscustomtask branch 2 times, most recently from cc606ca to c0cb9ba Compare March 29, 2023 22:43
@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_types.go 97.1% 97.1% 0.0
pkg/apis/pipeline/v1/taskref_types.go Do not exist 100.0%
pkg/apis/pipeline/v1beta1/pipeline_types.go 96.5% 96.5% 0.0
pkg/apis/pipeline/v1beta1/taskref_types.go Do not exist 100.0%
pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go 96.0% 95.9% -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_types.go 97.1% 97.1% 0.0
pkg/apis/pipeline/v1/taskref_types.go Do not exist 100.0%
pkg/apis/pipeline/v1beta1/pipeline_types.go 96.5% 96.5% 0.0
pkg/apis/pipeline/v1beta1/taskref_types.go Do not exist 100.0%
pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go 96.0% 95.9% -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_types.go 97.1% 97.1% 0.0
pkg/apis/pipeline/v1/taskref_types.go Do not exist 100.0%
pkg/apis/pipeline/v1beta1/pipeline_types.go 96.5% 96.5% 0.0
pkg/apis/pipeline/v1beta1/taskref_types.go Do not exist 100.0%
pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go 96.0% 95.9% -0.0

@tekton-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lbernick

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 Mar 30, 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_types.go 97.1% 97.1% 0.0
pkg/apis/pipeline/v1/taskref_types.go Do not exist 100.0%
pkg/apis/pipeline/v1beta1/pipeline_types.go 96.5% 96.5% 0.0
pkg/apis/pipeline/v1beta1/taskref_types.go Do not exist 100.0%
pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go 96.0% 95.9% -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_types.go 97.1% 97.1% 0.0
pkg/apis/pipeline/v1/taskref_types.go Do not exist 100.0%
pkg/apis/pipeline/v1beta1/pipeline_types.go 96.5% 96.5% 0.0
pkg/apis/pipeline/v1beta1/taskref_types.go Do not exist 100.0%
pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go 96.0% 95.9% -0.0

@jerop
Copy link
Member Author

jerop commented Mar 30, 2023

/retest

In this change, we clean up the `isCustomTask` function:
- Remove unused `context.Context`.
- Remove the check that either `TaskRef` or `TaskSpec` is specified
because we check that way before - see [code].
- Define the check that `TaskRef` is a `CustomTask` as a member function
of `TaskRef`; and add tests for the member function.
- Define the check that `TaskSpec` is a `CustomTask` as a member function
of `TaskSpec`; and add tests for the member function.
- Update the docstring for `Kind` and `APIVersion` in `TaskRef`.

There are no user-facing changes in this commit.

[code]: https://github.com/tektoncd/pipeline/blob/b7d815a9d8528547994f65da097050f472bbb8b2/pkg/apis/pipeline/v1beta1/pipeline_types.go#L216-L227
@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_types.go 97.1% 97.1% 0.0
pkg/apis/pipeline/v1/taskref_types.go Do not exist 100.0%
pkg/apis/pipeline/v1beta1/pipeline_types.go 96.5% 96.5% 0.0
pkg/apis/pipeline/v1beta1/taskref_types.go Do not exist 100.0%
pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go 96.0% 95.9% -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_types.go 97.1% 97.1% 0.0
pkg/apis/pipeline/v1/taskref_types.go Do not exist 100.0%
pkg/apis/pipeline/v1beta1/pipeline_types.go 96.5% 96.5% 0.0
pkg/apis/pipeline/v1beta1/taskref_types.go Do not exist 100.0%
pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go 96.0% 95.9% -0.0

@Yongxuanzhang
Copy link
Member

/lgtm

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 30, 2023
@tekton-robot tekton-robot merged commit 3ebba4d into tektoncd:main Mar 30, 2023
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/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. 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.

None yet

4 participants