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

fix: Correctly verify signatures when targetRevision is a branch name (cherry-pick #14214) #14236

Merged
merged 3 commits into from
Jun 29, 2023

Conversation

jannfis
Copy link
Member

@jannfis jannfis commented Jun 27, 2023

Cherry-picks #14214 into release-2.7

Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Toolchain Guide
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • Optional. My organization is added to USERS.md.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.

Please see Contribution FAQs if you have questions about your pull-request.

…argoproj#14214)

* fix: Correctly verify signatures when targetRevision is a branch name

Signed-off-by: jannfis <jann@mistrust.net>

* Add more e2e tests

Signed-off-by: jannfis <jann@mistrust.net>

* Fix a bug and add unit test

Signed-off-by: jannfis <jann@mistrust.net>

---------

Signed-off-by: jannfis <jann@mistrust.net>
Signed-off-by: jannfis <jann@mistrust.net>
Signed-off-by: jannfis <jann@mistrust.net>
@codecov
Copy link

codecov bot commented Jun 27, 2023

Codecov Report

Patch coverage: 88.00% and project coverage change: +0.01 🎉

Comparison is base (3424fa4) 48.89% compared to head (61e68b6) 48.91%.

Additional details and impacted files
@@               Coverage Diff               @@
##           release-2.7   #14236      +/-   ##
===============================================
+ Coverage        48.89%   48.91%   +0.01%     
===============================================
  Files              247      247              
  Lines            42762    42781      +19     
===============================================
+ Hits             20909    20925      +16     
- Misses           19741    19742       +1     
- Partials          2112     2114       +2     
Impacted Files Coverage Δ
reposerver/repository/repository.go 60.50% <70.00%> (+0.03%) ⬆️
util/exec/exec.go 100.00% <100.00%> (ø)
util/git/client.go 51.08% <100.00%> (+1.08%) ⬆️

... and 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@crenshaw-dev crenshaw-dev merged commit dd70d97 into argoproj:release-2.7 Jun 29, 2023
18 of 19 checks passed
schakrad pushed a commit to schakrad/argo-cd that referenced this pull request Jul 24, 2023
… (cherry-pick argoproj#14214) (argoproj#14236)

* fix: Correctly verify signatures when targetRevision is a branch name (argoproj#14214)

* fix: Correctly verify signatures when targetRevision is a branch name

Signed-off-by: jannfis <jann@mistrust.net>

* Add more e2e tests

Signed-off-by: jannfis <jann@mistrust.net>

* Fix a bug and add unit test

Signed-off-by: jannfis <jann@mistrust.net>

---------

Signed-off-by: jannfis <jann@mistrust.net>

* Update go.mod

Signed-off-by: jannfis <jann@mistrust.net>

* go mod tidy

Signed-off-by: jannfis <jann@mistrust.net>

---------

Signed-off-by: jannfis <jann@mistrust.net>
Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants