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

[cherry-pick] pkg/git: fix ssh credentials detection 🦀 #3484

Merged
merged 1 commit into from
Nov 2, 2020

Conversation

vdemeester
Copy link
Member

Changes

To detect ssh cerdentials (and validate the git clone url with
cerdentials), we do check if there is a $HOME/.ssh folder. With
disable-home-env-overwrite we do not overwrite $HOME env anymore,
and thus we have no control where $HOME is and wether the image
ships it with a .ssh or not.

This fixes it by looking at a path we control no matter how the
controller is configured : pipeline.CredsDir (/tekton/creds).

Signed-off-by: Vincent Demeester [email protected]
(cherry picked from commit b35bec8)
Signed-off-by: Vincent Demeester [email protected]

/cc @sbwsg @bobcatfish @afrittoli

Submitter Checklist

These are the criteria that every PR should meet, please check them off as you
review them:

  • Includes tests (if functionality changed/added)
  • Includes docs (if user facing)
  • Commit messages follow commit message best practices
  • Release notes block has been filled in or deleted (only if no user facing changes)

See the contribution guide for more details.

Double check this list of stuff that's easy to miss:

Reviewer Notes

If API changes are included, additive changes must be approved by at least two OWNERS and backwards incompatible changes must be approved by more than 50% of the OWNERS, and they must first be added in a backwards compatible way.

Release Notes

fix ssh credential wrong detection in git-init

To detect ssh cerdentials (and validate the git clone url with
cerdentials), we do check if there is a `$HOME/.ssh` folder. With
`disable-home-env-overwrite` we do not overwrite `$HOME` env anymore,
and thus we have *no* control where `$HOME` is and wether the image
ships it with a `.ssh` or not.

This fixes it by looking at a path we control no matter how the
controller is configured : `pipeline.CredsDir` (`/tekton/creds`).

Signed-off-by: Vincent Demeester <[email protected]>
(cherry picked from commit b35bec8)
Signed-off-by: Vincent Demeester <[email protected]>
@tekton-robot tekton-robot requested review from afrittoli, bobcatfish and a user November 2, 2020 13:35
@tekton-robot tekton-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 2, 2020
@ghost
Copy link

ghost commented Nov 2, 2020

/approve
/lgtm

@tekton-robot tekton-robot assigned ghost Nov 2, 2020
@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 2, 2020
@tekton-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbwsg

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 Nov 2, 2020
@vdemeester
Copy link
Member Author

/kind bug

@tekton-robot tekton-robot added the kind/bug Categorizes issue or PR as related to a bug. label Nov 2, 2020
@vdemeester vdemeester changed the title pkg/git: fix ssh credentials detection 🦀 [cherry-pick] pkg/git: fix ssh credentials detection 🦀 Nov 2, 2020
@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/git/git.go 2.4% 2.4% 0.1

@tekton-robot tekton-robot merged commit 240bf12 into tektoncd:release-v0.17.x Nov 2, 2020
@vdemeester vdemeester deleted the cherry-pick-3482 branch November 2, 2020 15:03
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/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants