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.

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

rpm: consult dnf database for repository information #869

Open
wants to merge 17 commits into
base: main
Choose a base branch
from

Conversation

hdonnay
Copy link
Member

@hdonnay hdonnay commented Mar 13, 2023

These changes make the rhel machinery consult both the rpm and dnf databases when possible.

See-also: #809

Copy link

codecov bot commented Jan 12, 2024

Codecov Report

Attention: Patch coverage is 29.52381% with 74 lines in your changes missing coverage. Please review.

Project coverage is 55.23%. Comparing base (c2fc225) to head (57bb054).

Files Patch % Lines
rpm/dnf.go 25.71% 52 Missing ⚠️
rpm/packagescanner.go 14.28% 18 Missing ⚠️
rhel/coalescer.go 57.14% 1 Missing and 2 partials ⚠️
rpm/native_db.go 85.71% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #869      +/-   ##
==========================================
- Coverage   55.39%   55.23%   -0.17%     
==========================================
  Files         282      283       +1     
  Lines       17836    17923      +87     
==========================================
+ Hits         9881     9899      +18     
- Misses       6923     6990      +67     
- Partials     1032     1034       +2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@hdonnay hdonnay changed the title wip: rpm: consult dnf database for repository information rpm: consult dnf database for repository information Dec 19, 2024
rpm/dnf.go Outdated
Comment on lines 49 to 52
if fi, err := fs.Stat(sys, `root/buildinfo/content_manifests`); errors.Is(err, nil) && fi.IsDir() {
// This is a RHEL layer, skip.
return nil, nil
}
Copy link
Member Author

Choose a reason for hiding this comment

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

  • Update this to check the files for a marker value and continue if found.

Should look for from_dnf_hint key in the yaml files.
See also: containerbuildsystem/atomic-reactor#2140

Copy link
Member Author

Choose a reason for hiding this comment

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

Punting on this unless we determine it's needed.

@cgwalters
Copy link

I created rpm-software-management/rpm#3505 related to this

@hdonnay hdonnay force-pushed the hack/dnf branch 3 times, most recently from 10b07ff to e59f165 Compare January 13, 2025 15:57
@hdonnay hdonnay force-pushed the hack/dnf branch 3 times, most recently from 8c86d88 to 7a459ba Compare January 22, 2025 20:08
@hdonnay hdonnay marked this pull request as ready for review January 22, 2025 20:22
@hdonnay hdonnay requested a review from a team as a code owner January 22, 2025 20:22
@hdonnay hdonnay requested review from RTann and removed request for a team January 22, 2025 20:22
@RTann RTann requested a review from crozzy January 22, 2025 22:11
Copy link
Contributor

@RTann RTann left a comment

Choose a reason for hiding this comment

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

made it through most of the files, but I'll need to come back to this another time. Would you mind making more commits and then squashing things at the end so it's easier to see the diffs after each round? Thanks

Copy link
Contributor

Choose a reason for hiding this comment

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

These txter test files are not net-new, I think they should be removed from rpm/testdata

environment.RepositoryIDs[i] = layerArtifacts.Repos[i].ID
v, _ := url.ParseQuery(pkg.RepositoryHint)
if id := v.Get("repoid"); id != "" {
environment.RepositoryIDs = v["repoid"]
Copy link
Contributor

Choose a reason for hiding this comment

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

This will leave inconsistencies in how the repo IDs are reported in index report. Packages with no specific repos will report their repo ids as numerical with the ability to be referenced back to repository objects (like current behaviour):

        "repository_ids": [
          "1",
          "2",
...

But packages that have a specific repoid specified by the DNF DB will have the repo slug that can not be directly referenced back to a repository object:

        "repository_ids": [
          "rhel-9-for-x86_64-appstream-rpms"
        ]

We should think of a way to make these consistent to keep the expectation that "repository_ids" will refer to keys in the "repository" section and not a mix of the claircore.Repository.ID and (what will be persisted as) the claircore.Repository.Name.

Copy link
Contributor

Choose a reason for hiding this comment

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

Could do something like this:

func lookupRepositoryID(repos []*claircore.Repository, slug string) string {
       for _, r := range repos {
               if r.Name == slug {
                       return r.ID
               }
       }
       return ""
}

and then

if slug := v.Get("repoid"); slug != "" {
    if id := lookupRepositoryID(layerArtifacts.Repos, slug); id != "" {
         environment.RepositoryIDs = []string{id}
    }

This should always find a repo as repository scanner should be finding the same repos as the package scanner.

Copy link
Contributor

Choose a reason for hiding this comment

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

This suggestion is incomplete in that we need to append all repositories who's Name == repoid, not just the first one as the example code does

@hdonnay hdonnay force-pushed the hack/dnf branch 2 times, most recently from d8a2dad to e6a4e27 Compare March 24, 2025 22:51
hdonnay added 16 commits March 25, 2025 08:50
Using these should give us a nice "todo" list when the time comes.

Signed-off-by: Hank Donnay <[email protected]>
This adds two helpers: one to discover repoids, and one to annotate a
stream of Packages.

Signed-off-by: Hank Donnay <[email protected]>
Signed-off-by: Hank Donnay <[email protected]>
Signed-off-by: Hank Donnay <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants