ArgoCD Steps: Replace directory-separator for Patches/Replaced files directly prior to reporting#1837
Merged
ArgoCD Steps: Replace directory-separator for Patches/Replaced files directly prior to reporting#1837
Conversation
eddymoulton
approved these changes
Mar 19, 2026
Contributor
eddymoulton
left a comment
eddymoulton
left a comment
There was a problem hiding this comment.
This is a great change, much cleaner.
As I wrote my suggestion for clarifying the comment it occurred to me that perhaps this logic doesn't belong to Calamari at all and Server should be fixed up the paths before it tries to use them.
I wouldn't block on that, this is still a step forward, but up to you if you want to take it that next step further.
|
|
||
| public void ReportFilesUpdated(IReadOnlyList<ProcessApplicationResult> applicationResults) | ||
| { | ||
| //file paths _must_ use forward slashes for directory separators |
Contributor
There was a problem hiding this comment.
Suggested change
| //file paths _must_ use forward slashes for directory separators | |
| // file paths _must_ use forward slashes for directory separators for parsing by LibGit2Sharp |
Contributor
Author
There was a problem hiding this comment.
Technically this is posix as it heading back to server via a service message - and that contract requires a posix path (yes because server puts it into libgit2sharp, but that's a step removed from here).
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Currently for all steps, the FilePathContent has its file-path updated to be posix compliant at the point that the file is updated.
However - it really isn't a function of the step - the change to posix-compliance is a requirement of the reporter - i.e. Server needs these paths to be posix - not the actual internal functionality of Calamari.
Thus - we move the path-adjustment out from the business logic, and into the "translate to server format" area.
This does not require a server update.