feat: glob resolver repo impl#844
Merged
matthiasbruns merged 23 commits intoSep 12, 2025
Merged
Conversation
On-behalf-of: SAP <matthias.bruns@sap.com> Signed-off-by: Matthias Bruns <git@matthiasbruns.com>
…-model into feat/575_regex_glob_resolver_repository Signed-off-by: Matthias Bruns <git@matthiasbruns.com>
On-behalf-of: SAP <matthias.bruns@sap.com> Signed-off-by: Matthias Bruns <git@matthiasbruns.com>
…matthiasbruns/open-component-model into feat/575_regex_glob_resolver_repository Signed-off-by: Matthias Bruns <git@matthiasbruns.com>
7ffbbd8 to
7d6a9a1
Compare
On-behalf-of: SAP <matthias.bruns@sap.com> Signed-off-by: Matthias Bruns <git@matthiasbruns.com>
On-behalf-of: SAP <matthias.bruns@sap.com> Signed-off-by: Matthias Bruns <git@matthiasbruns.com>
…:matthiasbruns/open-component-model into feat/575_regex_glob_resolver_repository
On-behalf-of: SAP <matthias.bruns@sap.com> Signed-off-by: Matthias Bruns <git@matthiasbruns.com>
…matthiasbruns/open-component-model into feat/575_regex_glob_resolver_repository
On-behalf-of: SAP <matthias.bruns@sap.com> Signed-off-by: Matthias Bruns <git@matthiasbruns.com>
Contributor
Author
|
@jakobmoellerdev ping |
Skarlso
reviewed
Sep 11, 2025
Skarlso
reviewed
Sep 11, 2025
On-behalf-of: SAP <matthias.bruns@sap.com> Signed-off-by: Matthias Bruns <git@matthiasbruns.com>
On-behalf-of: SAP <matthias.bruns@sap.com> Signed-off-by: Matthias Bruns <git@matthiasbruns.com>
…matthiasbruns/open-component-model into feat/575_regex_glob_resolver_repository
On-behalf-of: SAP <matthias.bruns@sap.com> Signed-off-by: Matthias Bruns <git@matthiasbruns.com>
jakobmoellerdev
approved these changes
Sep 11, 2025
Contributor
Author
|
@fabianburth ping :) |
Skarlso
approved these changes
Sep 11, 2025
Member
|
@matthiasbruns please do not merge if we are still pending on other reviewers next time. |
fabianburth
reviewed
Sep 12, 2025
Comment on lines
+103
to
+124
| // GetComponentVersion retrieves a component version from the first repository | ||
| // that matches the component name. If no repository matches the component name, | ||
| // or if the component version is not found in any matching repository, an error | ||
| // is returned. | ||
| func (r *ResolverRepository) GetComponentVersion(ctx context.Context, component, version string) (*descriptor.Descriptor, error) { | ||
| repos := r.RepositoriesForComponentIterator(ctx, component) | ||
| for repo, err := range repos { | ||
| if err != nil { | ||
| return nil, fmt.Errorf("getting repository for component %s failed: %w", component, err) | ||
| } | ||
| desc, err := repo.GetComponentVersion(ctx, component, version) | ||
| if errors.Is(err, repository.ErrNotFound) { | ||
| slog.DebugContext(ctx, "component version not found in repository", "realm", Realm, "repository", repo, "component", component, "version", version) | ||
| continue // try the next repository | ||
| } | ||
| if err != nil { | ||
| return nil, fmt.Errorf("getting component version %s/%s from repository %v failed: %w", component, version, repo, err) | ||
| } | ||
| return desc, nil | ||
| } | ||
| return nil, fmt.Errorf("component version %s/%s not found in any repository", component, version) | ||
| } |
Contributor
There was a problem hiding this comment.
I'm a little confused, tbh. I think our goal was specifically to create a resolver WITHOUT fallback behaviour - both because its more efficient and easier to maintain.
But if I understand this correctly, we now have an even more complex fallback resolver, right?
fabianburth
reviewed
Sep 12, 2025
Comment on lines
+141
to
+165
| for repo, err := range repos { | ||
| errGroup.Go(func() error { | ||
| if err != nil { | ||
| return fmt.Errorf("getting repository for component %s failed: %w", component, err) | ||
| } | ||
| var versions []string | ||
| versions, err = repo.ListComponentVersions(ctx, component) | ||
| if err != nil { | ||
| return fmt.Errorf("listing component versions for %s failed: %w", component, err) | ||
| } | ||
| if len(versions) == 0 { | ||
| slog.DebugContext(ctx, "no versions found for component", "component", component, "repository", repo) | ||
| return nil | ||
| } | ||
| slog.DebugContext(ctx, "found versions for component", "component", component, "versions", versions, "repository", repo) | ||
| versionsMu.Lock() | ||
| defer versionsMu.Unlock() | ||
| for _, version := range versions { | ||
| if r.matchesAnyResolver(component) { | ||
| accumulatedVersions[version] = struct{}{} | ||
| } | ||
| } | ||
| return nil | ||
| }) | ||
| } |
Contributor
There was a problem hiding this comment.
We do not want to accumulate the versions from all matching repositories anymore.
Comment on lines
+177
to
+198
| func (r *ResolverRepository) RepositoriesForComponentIterator(ctx context.Context, component string) iter.Seq2[repository.ComponentVersionRepository, error] { | ||
| return func(yield func(repository.ComponentVersionRepository, error) bool) { | ||
| r.matchersMu.RLock() | ||
| defer r.matchersMu.RUnlock() | ||
| for index, resolver := range r.resolvers { | ||
| if !r.matchers[index].Match(component, "") { | ||
| continue | ||
| } | ||
|
|
||
| repo, err := r.getRepositoryForSpecification(ctx, resolver.Repository) | ||
| if err != nil { | ||
| yield(nil, fmt.Errorf("getting repository for resolver %v failed: %w", resolver, err)) | ||
| return | ||
| } | ||
|
|
||
| slog.DebugContext(ctx, "yielding repository for component", "realm", Realm, "component", component, "repository", resolver.Repository) | ||
| if !yield(repo, nil) { | ||
| return | ||
| } | ||
| } | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
Iterator should not be necessary anymore, as the matching would not include fallback behaviour. Instead, this would rather be a GetComponentVersionRepositoryForComponent.
Thinking about whether this resolver should even implement the ComponentVersionRepository interface. A RepositoryProvider like interface feels like a better fit here.
Contributor
There was a problem hiding this comment.
I think what we want is a
type RepositorySpecProvider interface {
GetRepositorySpec(ctx context.Context, componentIdentity runtime.Identity) (runtime.Typed, error)
}
This can then be used in combination with a ComponentVersionRepositoryProvider to get an actual ComponentVersionRepository.
type ComponentVersionRepositoryProvider interface {
GetComponentVersionRepositoryCredentialConsumerIdentity(ctx context.Context, repositorySpecification runtime.Typed) (runtime.Identity, error)
GetComponentVersionRepository(ctx context.Context, repositorySpecification runtime.Typed, credentials map[string]string) (ComponentVersionRepository, error)
}
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
4 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.
What this PR does / why we need it
In #780 we implemented a new configuration resolver implementation that resolves components with a glob matcher. This PR implement the repository that uses the new matcher
Which issue(s) this PR fixes
Contributes open-component-model/ocm-project#575