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.

Sign up for GitHub

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

Jump to bottom

feat: revisions info reporting with multi-sourced apps support #333

Open
wants to merge 24 commits into
base: release-2.12
Choose a base branch
from
Open

feat: revisions info reporting with multi-sourced apps support #333

wants to merge 24 commits into from
+688 −95

Conversation

oleksandr-codefresh
Copy link

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.
  • 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.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

pasha-codefresh
pasha-codefresh requested changes Sep 27, 2024
View reviewed changes
pkg/apis/application/v1alpha1/types_codefresh.go Outdated
}
}

if a.Source != nil { // single source app
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please just check if app has source and return this source, otherwise execute logic after.

It is impossible that app will not have source at all

pasha-codefresh
pasha-codefresh requested changes Sep 27, 2024
View reviewed changes
event_reporter/utils/app_revision.go Outdated
// for monorepo support: list with revisions where actual changes to source directory were committed
func GetOperationChangeRevisions(a *appv1.Application) []string {
var revisions []string
if a != nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you please check if app is nil then return empty array, it will not have so much embedded conditions

event_reporter/utils/app_revision.go Outdated
@@ -46,6 +63,64 @@ func GetOperationRevision(a *appv1.Application) string {
return revision
}

func GetOperationSyncRevisions(a *appv1.Application) []string {
var revisions []string
if a != nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

event_reporter/utils/app_revision.go Outdated
Revisions: a.Status.OperationState.Operation.Sync.ChangeRevisions,
})
}
} else if a.Operation != nil && a.Operation.Sync != nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we will rid of idea to put it on operation level, we will just persist it on status

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's just as a fallback so can leave ATM

pasha-codefresh
pasha-codefresh requested changes Sep 30, 2024
View reviewed changes
event_reporter/reporter/app_revision.go Outdated

for idx, revision := range revisions {
// report just revision for helm sources
if (a.Spec.HasMultipleSources() && a.Spec.Sources[idx].IsHelm()) || (a.Spec.Source != nil && a.Spec.Source.IsHelm()) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please move this condition into dedicated types . Make it a.Spec.IsHelm(idx)

event_reporter/reporter/app_revision.go Outdated
if err == nil && operationSyncRevisionsMetadata != nil {
result.SyncRevisions = operationSyncRevisionsMetadata
}
// latest revision of repository where changes to app resource were actually made; empty if no changeRevisionі present
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo

event_reporter/reporter/event_payload.go Outdated
u = utils.AddCommitDetailsToLabels(u, originalAppRevisionMetadata)
if originalAppRevisionsMetadata != nil {
u = utils.AddCommitsDetailsToAnnotations(u, originalAppRevisionsMetadata)
if originalApplication != nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

imho it is redundant

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed

event_reporter/utils/app_revision.go Outdated
@@ -46,6 +63,70 @@ func GetOperationRevision(a *appv1.Application) string {
return revision
}

func GetOperationSyncRevisions(a *appv1.Application) []string {
var revisions []string
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is redundant variable, you can remove it

@oleksandr-codefresh
event-reporter: changes after pr reviev, fixing typo, added dedicated…
006f6db 
… func a.Spec.IsHelmSource(idx), removed legacy code
@oleksandr-codefresh
Merge branch 'CR-23842-revisions-info-reporting' of github.com:codefr…
c6d1667 
…esh-io/argo-cd into CR-23842-revisions-info-reporting
@oleksandr-codefresh
event-reporter: refactoring of getApplicationLegacyRevisionDetails me…
fb704ae 
…thod
@oleksandr-codefresh
event-reporter / app_revision_test.go: added some tests to AddCommits…
91272b6 
…DetailsToAnnotations, AddCommitsDetailsToAppAnnotations, getRevisions, getOperationSyncRevisions
@oleksandr-codefresh
event-reporter / app_revision_test.go: added tests for GetRevisionsDe…
a8cc45e 
…tails method
@oleksandr-codefresh
event-reporter: updated app client to support sourceIndex param in no…
02c14a3 
…n-grpc mode
@oleksandr-codefresh
event-reporter / app_revision.go: added sourceIndex param to applicat…
09fddac 
…ionServiceClient.RevisionMetadata in order to properly support multisourced apps
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pasha-codefresh pasha-codefresh pasha-codefresh requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@oleksandr-codefresh @pasha-codefresh