feat(event-reporter): multi-sourced apps - resource git details reporting #352
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
…kingMetadata to pass data between methods
…EntityParentApp to pass data between methods
…Resource to pass data between methods, created new methods to group logic inside getResourceEventPayload
…onSyncRevisions, destServer, destName, appMultiSourced
…s SourcePositions, Revisions for GetManifests request
…sion for multi-sourced applications based on sync result revisions
…R-23668-multisource-details-reporting # Conflicts: # event_reporter/reporter/application_event_reporter.go # event_reporter/reporter/event_payload.go # event_reporter/reporter/types.go
…ce index to which this resource belongs. Also updated logic of retrieving correct git commit info based on AppSourceIdx
pasha-codefresh
requested changes
Nov 13, 2024
event_reporter/application/client.go
Outdated
| @@ -126,6 +126,16 @@ func (c *httpApplicationClient) GetManifests(ctx context.Context, in *appclient. | |||
| if in.Revision != nil { | |||
| params = fmt.Sprintf("%s&revision=%s", params, *in.Revision) | |||
| } | |||
| if in.SourcePositions != nil && len(in.SourcePositions) > 0 { | |||
| for _, sourcePosition := range in.SourcePositions { | |||
| params = fmt.Sprintf("%s&sourcePositions=%s", params, sourcePosition) | |||
There was a problem hiding this comment.
you have linter issues here
event_reporter/utils/app_revision.go
Outdated
|
|
||
| // this value will be used in case if application hasn't resources , like gitsource | ||
| revisions := a.Status.Sync.Revisions | ||
| if a.Status.OperationState != nil && a.Status.OperationState.Operation.Sync != nil && a.Status.OperationState.Operation.Sync.Revisions != nil && len(a.Status.OperationState.Operation.Sync.Revisions) > 0 { |
There was a problem hiding this comment.
lets change to if -> return, and tbh i would move these if condition to some function, it is just very hard to read, i would move it to our custom types that we created before
There was a problem hiding this comment.
moved to separate func
| @@ -65,14 +72,38 @@ func GetOperationRevision(a *appv1.Application) string { | |||
| return revision | |||
| } | |||
|
|
|||
| func GetOperationStateRevision(a *appv1.Application) *string { | |||
| func GetOperationRevisions(a *appv1.Application) []string { | |||
There was a problem hiding this comment.
also cover with basic test
| if a == nil || a.Status.OperationState == nil || a.Status.OperationState.SyncResult == nil { | ||
| return nil | ||
| } | ||
|
|
||
| return &a.Status.OperationState.SyncResult.Revision | ||
| } | ||
|
|
||
| func GetOperationSyncResultRevisions(a *appv1.Application) *[]string { |
reposerver/repository/repository.go
Outdated
| @@ -1812,21 +1812,18 @@ var manifestFile = regexp.MustCompile(`^.*\.(yaml|yml|json|jsonnet)$`) | |||
|
|
|||
| // findManifests looks at all yaml files in a directory and unmarshals them into a list of unstructured objects | |||
| func findManifests(logCtx *log.Entry, appPath string, repoRoot string, env *v1alpha1.Env, directory v1alpha1.ApplicationSourceDirectory, enabledManifestGeneration map[string]bool, maxCombinedManifestQuantity resource.Quantity) ([]manifest, error) { | |||
| absRepoRoot, err := filepath.Abs(repoRoot) | |||
There was a problem hiding this comment.
i just moved this line below, to have our changes in one place (will simplify new upstream version merging)
| @@ -574,6 +574,7 @@ func (s *Server) GetManifests(ctx context.Context, q *application.ApplicationMan | |||
| manifestInfo.Manifests[i].CompiledManifest = string(data) | |||
| } | |||
| } | |||
| manifests.SourcesManifestsStartingIdx = append(manifests.SourcesManifestsStartingIdx, int32(len(manifests.Manifests))) | |||
There was a problem hiding this comment.
why you need this field? should we push it to OSS ?
There was a problem hiding this comment.
I need it to be able to report correct repo url, etc. for multi-sourced apps
There was a problem hiding this comment.
I think this info is useful for OSS also
oleksandr-codefresh
force-pushed
the
CR-23668-multisource-details-reporting
branch
from
39ee73d
to
b348e9a
Compare
oleksandr-codefresh
force-pushed
the
CR-23668-multisource-details-reporting
branch
from
69451f9
to
d780165
Compare
…R-23668-multisource-details-reporting # Conflicts: # changelog/CHANGELOG.md
pasha-codefresh
approved these changes
Nov 18, 2024
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.
Checklist: