feat: Update command argocd app history to support multiple sources #17530
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
… sources along with all the REVISIONS Signed-off-by: Mangaal <angommeeteimangaal@gmail.com>
cmd/argocd/commands/app.go
Outdated
Comment on lines
2473
to
2496
| if depInfo.Source.RepoURL != "" { | ||
| rev := depInfo.Source.TargetRevision | ||
| if len(depInfo.Revision) >= 7 { | ||
| rev = fmt.Sprintf("%s (%s)", rev, depInfo.Revision[0:7]) | ||
| } | ||
| varHistory[depInfo.Source.RepoURL] = append(varHistory[depInfo.Source.RepoURL], history{ | ||
| id: depInfo.ID, | ||
| date: depInfo.DeployedAt.String(), | ||
| revision: rev, | ||
| }) | ||
| } | ||
| if depInfo.Sources != nil { | ||
| for i, sourceInfo := range depInfo.Sources { | ||
| rev := sourceInfo.TargetRevision | ||
| if len(depInfo.Revisions) == len(depInfo.Sources) && len(depInfo.Revisions[i]) >= 7 { | ||
| rev = fmt.Sprintf("%s (%s)", rev, depInfo.Revisions[i][0:7]) | ||
| } | ||
| varHistory[sourceInfo.RepoURL] = append(varHistory[sourceInfo.RepoURL], history{ | ||
| id: depInfo.ID, | ||
| date: depInfo.DeployedAt.String(), | ||
| revision: rev, | ||
| }) | ||
| } | ||
| } |
There was a problem hiding this comment.
As Sources takes priority over Source, the if clause should be something like below:
if depInfo.Sources != nil {
...
} else {
...
}
| } | ||
| } | ||
|
|
||
| func TestPrintApplicationHistoryTableWithMultipleSources(t *testing.T) { |
There was a problem hiding this comment.
Let's also add a test where the application has both source and sources, but the history command only displays history of sources.
There was a problem hiding this comment.
Hi @ishitasequeira , I have updated the PR with the changes you have suggested.
…om/Mangaal/argo-cd into feat/upadte-cli-argocd-app-history
anandf
reviewed
Mar 15, 2024
cmd/argocd/commands/app.go
Outdated
| rev = fmt.Sprintf("%s (%s)", rev, depInfo.Revision[0:7]) | ||
| if depInfo.Source.RepoURL != "" { | ||
| rev := depInfo.Source.TargetRevision | ||
| if len(depInfo.Revision) >= 7 { |
There was a problem hiding this comment.
Can we avoid this magic number 7 and create a constant like MAX_ALLOWED_REVISIONS ?
There was a problem hiding this comment.
Hi @anandf , I have removed the no 7 and added a var MAX_ALLOWED_REVISIONS
…to overlooked source if sources is persent Signed-off-by: Mangaal <angommeeteimangaal@gmail.com>
Signed-off-by: Mangaal <angommeeteimangaal@gmail.com>
…om/Mangaal/argo-cd into feat/upadte-cli-argocd-app-history
cmd/argocd/commands/app_test.go
Outdated
| } | ||
| } | ||
|
|
||
| func TestPrintApplicationHistoryTableForWhenBothSourcesAndSourceFiledsExist(t *testing.T) { |
There was a problem hiding this comment.
The testcase mentions source and sources field but it seems we covered it in above test case. Maybe we can remove this testcase. Rest of the PR looks good.
There was a problem hiding this comment.
Hi @ishitasequeira , I have removed the extra unit test.
…om/Mangaal/argo-cd into feat/upadte-cli-argocd-app-history
Signed-off-by: Mangaal <angommeeteimangaal@gmail.com>
…rcesAndSourceFiledsExist() Signed-off-by: Mangaal <angommeeteimangaal@gmail.com>
…om/Mangaal/argo-cd into feat/upadte-cli-argocd-app-history
ishitasequeira
approved these changes
Mar 25, 2024
lyda
pushed a commit
to lyda/argo-cd
that referenced
this pull request
Mar 28, 2024
…rgoproj#17530) * update argocd app history command to print app history group by thier sources along with all the REVISIONS Signed-off-by: Mangaal <angommeeteimangaal@gmail.com> * upadte unit test to ahve both Source and Sources and update function to overlooked source if sources is persent Signed-off-by: Mangaal <angommeeteimangaal@gmail.com> * remove magic no 7 and introduc a variable MAX_ALLOWED_REVISIONS Signed-off-by: Mangaal <angommeeteimangaal@gmail.com> * remove extra unit test Signed-off-by: Mangaal <angommeeteimangaal@gmail.com> * remove extra unit test TestPrintApplicationHistoryTableForWhenBothSourcesAndSourceFiledsExist() Signed-off-by: Mangaal <angommeeteimangaal@gmail.com> --------- Signed-off-by: Mangaal <angommeeteimangaal@gmail.com> Co-authored-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com> Signed-off-by: Kevin Lyda <kevin@lyda.ie>
mkieweg
pushed a commit
to mkieweg/argo-cd
that referenced
this pull request
Jun 11, 2024
…rgoproj#17530) * update argocd app history command to print app history group by thier sources along with all the REVISIONS Signed-off-by: Mangaal <angommeeteimangaal@gmail.com> * upadte unit test to ahve both Source and Sources and update function to overlooked source if sources is persent Signed-off-by: Mangaal <angommeeteimangaal@gmail.com> * remove magic no 7 and introduc a variable MAX_ALLOWED_REVISIONS Signed-off-by: Mangaal <angommeeteimangaal@gmail.com> * remove extra unit test Signed-off-by: Mangaal <angommeeteimangaal@gmail.com> * remove extra unit test TestPrintApplicationHistoryTableForWhenBothSourcesAndSourceFiledsExist() Signed-off-by: Mangaal <angommeeteimangaal@gmail.com> --------- Signed-off-by: Mangaal <angommeeteimangaal@gmail.com> Co-authored-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com>
Hariharasuthan99
pushed a commit
to AmadeusITGroup/argo-cd
that referenced
this pull request
Jun 16, 2024
…rgoproj#17530) * update argocd app history command to print app history group by thier sources along with all the REVISIONS Signed-off-by: Mangaal <angommeeteimangaal@gmail.com> * upadte unit test to ahve both Source and Sources and update function to overlooked source if sources is persent Signed-off-by: Mangaal <angommeeteimangaal@gmail.com> * remove magic no 7 and introduc a variable MAX_ALLOWED_REVISIONS Signed-off-by: Mangaal <angommeeteimangaal@gmail.com> * remove extra unit test Signed-off-by: Mangaal <angommeeteimangaal@gmail.com> * remove extra unit test TestPrintApplicationHistoryTableForWhenBothSourcesAndSourceFiledsExist() Signed-off-by: Mangaal <angommeeteimangaal@gmail.com> --------- Signed-off-by: Mangaal <angommeeteimangaal@gmail.com> Co-authored-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com>
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.
Description
This PR update the
argocd app historycommand to display the history of an application grouped by their sources. The updated output now includes the source URL, along with the application history details such as ID, date, and revision.Changes Made
argocd app historycommand to group the application history by source.Previous command output
Output after changes
Checklist: