cmd-diff: fix rpm diffing in a build-with-buildah world #4321
Conversation
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request fixes RPM diffing for builds created with buildah. The changes involve using the build ID instead of the ostree commit hash for rpm-ostree db diff and forcing a full ostree import instead of a partial one, as ostree-commit-object is not available. The changes look correct and align with the description. I've added one suggestion to improve code clarity by renaming variables to more accurately reflect their contents.
In the build-with-buildah world there is no ostree-commit-object so there is no lightweight (i.e. partial import) way to do a db diff. We have to do a full import here unless we somehow start storing RPM NEVRAs in a label or annotation. Also, we need to pass the version (id) to `db diff` because the commit checksum in the metadata doesn't seem to work when diffing a build-with-buildah image.
dustymabe
force-pushed
the
dusty-rpm-diffs
branch
from
f8cdd2d to
a525688
Compare
There was a problem hiding this comment.
There is both manifest-lock.generated.$arch.json (#4249) and commitmeta.json (#4293) nowadays that are part of the build dir and have the list of RPMs. So we could use those. The problem is that it wouldn't be rpm-ostree doing the diff but us. Not hard obviously, just toil.
Anyway, for now yeah this obviously works.
How about just doing a |
These files don't get pulled when you buildfetch, which we could change but..
yeah, I think the legibility thing here is pretty important. You know I hate waste and here I am advocating for pulling a fat container down instead of a text file. That's how important I think the legibility is. I guess we could implement a formatter here in this code to get us back to parity on the legibility front, but until then I'd like to ship this. |
In the build-with-buildah world there is no ostree-commit-object so there is no lightweight (i.e. partial import) way to do a db diff. We have to do a full import here unless we somehow start storing RPM NEVRAs in a label or annotation.
Also, we need to pass the version (id) to
db diffbecause the commit checksum in the metadata doesn't seem to work when diffing a build-with-buildah image.