From f86dd3440c825c8122e30db2431c1cff5aa99aff Mon Sep 17 00:00:00 2001 From: Hank Donnay Date: Wed, 5 Apr 2023 14:56:23 -0500 Subject: [PATCH] rhel: use repoid when present Signed-off-by: Hank Donnay --- rhel/coalescer.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/rhel/coalescer.go b/rhel/coalescer.go index 2e1ab9046..1110bad83 100644 --- a/rhel/coalescer.go +++ b/rhel/coalescer.go @@ -2,6 +2,7 @@ package rhel import ( "context" + "net/url" "github.com/quay/claircore" "github.com/quay/claircore/indexer" @@ -116,10 +117,15 @@ func (*Coalescer) Coalesce(ctx context.Context, artifacts []*indexer.LayerArtifa PackageDB: pkg.PackageDB, IntroducedIn: layerArtifacts.Hash, DistributionID: distID, - RepositoryIDs: make([]string, len(layerArtifacts.Repos)), } - for i := range layerArtifacts.Repos { - environment.RepositoryIDs[i] = layerArtifacts.Repos[i].ID + v, _ := url.ParseQuery(pkg.RepositoryHint) // Ignore error + if id := v.Get("repoid"); id != "" { + environment.RepositoryIDs = v["repoid"] + } else { + environment.RepositoryIDs = make([]string, len(layerArtifacts.Repos)) + for i := range layerArtifacts.Repos { + environment.RepositoryIDs[i] = layerArtifacts.Repos[i].ID + } } db.packages[pkg.ID] = pkg db.environments[pkg.ID] = environment