Bump to newer ocidir and containers-image-proxy#1377
Merged
Conversation
Mostly just keeping up with things, but this is also prep for us using `GetRawBlob`. Signed-off-by: Colin Walters <walters@verbum.org>
Contributor
There was a problem hiding this comment.
Code Review
The pull request bumps the versions of ocidir and containers-image-proxy. There are several instances where error handling could be improved by explicitly handling the result of functions like read_index and new_empty_manifest instead of unwrapping them. Additionally, adding comments to explain the use of try_clone() would improve code clarity.
| )?; | ||
|
|
||
| let mut manifest = ocidir::new_empty_manifest().build().unwrap(); | ||
| let mut manifest = writer.new_empty_manifest()?.build().unwrap(); |
Contributor
There was a problem hiding this comment.
| let idx = tempsrc | ||
| .read_index()? | ||
| .ok_or(anyhow!("Reading image index from source"))?; | ||
| let idx = tempsrc.read_index()?; |
Contributor
Collaborator
Author
There was a problem hiding this comment.
Gemini is apparently just confused by us dropping a ?, clearly the error is still handled
|
|
||
| let mut config = ImageConfigurationBuilder::default().build().unwrap(); | ||
| let mut manifest = ocidir::new_empty_manifest().build().unwrap(); | ||
| let mut manifest = self.src_oci.new_empty_manifest()?.build().unwrap(); |
Contributor
There was a problem hiding this comment.
| self.src_oci | ||
| .replace_with_single_manifest(manifest, oci_image::Platform::default())?; | ||
| let idx = self.src_oci.read_index()?.unwrap(); | ||
| let idx = self.src_oci.read_index()?; |
Contributor
jeckersb
approved these changes
Jun 17, 2025
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
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.
Mostly just keeping up with things, but this is also prep for us using
GetRawBlob.