fix: handle annotated git tags correctly in repo server cache #21771
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
🔴 Preview Environment stopped on BunnyshellSee: Environment Details | Pipeline Logs Available commands (reply to this comment):
|
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #21771 +/- ##
==========================================
+ Coverage 55.71% 55.72% +0.01%
==========================================
Files 341 341
Lines 57002 57006 +4
==========================================
+ Hits 31756 31764 +8
+ Misses 22601 22599 -2
+ Partials 2645 2643 -2 ☔ View full report in Codecov by Sentry. |
aali309
force-pushed
the
self_heal
branch
2 times, most recently
from
964f4f8 to
3e5b8c9
Compare
aali309
force-pushed
the
self_heal
branch
5 times, most recently
from
519e768 to
20430c0
Compare
anandf
reviewed
Feb 14, 2025
util/git/client_test.go
Outdated
| assert.Equal(t, tagRef.Name(), resolvedRef.Name()) | ||
| } | ||
|
|
||
| func resolveTagReference(tagRef *plumbing.Reference, commitHash plumbing.Hash) *plumbing.Reference { |
There was a problem hiding this comment.
De we need this separate test helper method ? All it does is wrap a function call.
There was a problem hiding this comment.
This can be removed.
anandf
reviewed
Feb 14, 2025
| image: quay.io/argoprojlabs/argocd-e2e-container:0.1 | ||
| ports: | ||
| - containerPort: 80 | ||
| - name: nginx |
There was a problem hiding this comment.
this formatting change may not be required.
There was a problem hiding this comment.
Yes, this is default Cursor app behaviour!
jgwest
reviewed
Feb 14, 2025
| @@ -90,3 +98,79 @@ func TestGitSemverResolutionUsingConstraintWithLeadingZero(t *testing.T) { | |||
| Expect(SyncStatusIs(SyncStatusCodeSynced)). | |||
| Expect(Pod(func(p corev1.Pod) bool { return strings.HasPrefix(p.Name, "new-app") })) | |||
| } | |||
|
|
|||
| func TestAnnotatedTagInStatusSyncRevision(t *testing.T) { | |||
There was a problem hiding this comment.
- Your E2E tests are not currently correctly testing the failing case, AFAICT.
- Notice that if you comment out your fix in this PR (e.g. you remove the changes in
workaround.go), that those E2E tests still pass.- Since the fix has been removed, obviously the tests should fail. If they don't, that means the tests aren't testing what we think they are.
- The tests in my original E2E test branch do not exhibit this behaviour, if you want to use those as originally constructed.
Signed-off-by: Atif Ali <[email protected]> added e2e test Signed-off-by: Atif Ali <[email protected]> updated e2e tests Signed-off-by: Atif Ali <[email protected]> add unit test and linter fix Signed-off-by: Atif Ali <[email protected]>
…t fetched Signed-off-by: Atif Ali <[email protected]> added tests Signed-off-by: Atif Ali <[email protected]>
Signed-off-by: Atif Ali <[email protected]>
Signed-off-by: Atif Ali <[email protected]>
Signed-off-by: Atif Ali <[email protected]>
Signed-off-by: Atif Ali <[email protected]>
Signed-off-by: Atif Ali <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When using annotated git tags with auto-sync enabled but self-heal disabled, manual changes were getting reverted. This was happening because the repo server cache wasn't handling annotated tags correctly.
Fixes: #21548
See #20082 for detailed description of what caused the regression, but TL;DR: this behaviour is currently present in v2.11.x, v2.12.x, v2.13.x and current master
Checklist: