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.

Sign up for GitHub

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

Jump to bottom

fix: /image/{name or id}/json returns RootFS layers #8109

Merged
merged 3 commits into from
Oct 23, 2020
Merged

fix: /image/{name or id}/json returns RootFS layers #8109

merged 3 commits into from
Oct 23, 2020

Conversation

matejvasek
Copy link
Contributor

Signed-off-by: Matej Vasek [email protected]

@mheon
Copy link
Member

mheon commented Oct 22, 2020

/approve
LGTM
@jwhonce @baude @vrothberg PTAL

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 22, 2020
@rhatdan
Copy link
Member

rhatdan commented Oct 22, 2020

Thanks @matejvasek
/lgtm
/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 22, 2020
@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 22, 2020
@jwhonce
Copy link
Member

jwhonce commented Oct 22, 2020

LGTM

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Oct 22, 2020
@matejvasek
Copy link
Contributor Author

matejvasek commented Oct 22, 2020 •
edited
Loading

I just added some nil checks, info.RootFS should be always non-nil, not sure about info.RootFS.Layers. But better safe than sorry.

@matejvasek
src: add nil checks
5098048 
Signed-off-by: Matej Vasek <[email protected]>
@matejvasek matejvasek force-pushed the inspect-apiv2-rootfs branch from 52bfbd6 to 5098048 Compare October 22, 2020 16:33
TomSweeneyRedHat
TomSweeneyRedHat reviewed Oct 22, 2020
View reviewed changes
pkg/api/handlers/types.go Outdated
@@ -271,6 +271,15 @@ func ImageDataToImageInspect(ctx context.Context, l *libpodImage.Image) (*ImageI
if err != nil {
return nil, err
}

rootfs := docker.RootFS{}
if info.RootFS != nil && info.RootFS.Layers != nil {
Copy link
Member

Choose a reason for hiding this comment

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

Should this be split? i.e. test RootFS for nil and then set RootFS.Type if it is not nil, then test for RootFS.Layers and set that if it is not nil.

Copy link
Contributor Author

@matejvasek matejvasek Oct 22, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

I fixed that. It turned out that it's OK to call len() and range on nil slice.

@matejvasek
src: nil check
a997b59 
Signed-off-by: Matej Vasek <[email protected]>
@rhatdan
Copy link
Member

rhatdan commented Oct 22, 2020

Thanks @matejvasek
/lgtm
/hold
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 22, 2020
@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: matejvasek, mheon, rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@rhatdan
Copy link
Member

rhatdan commented Oct 23, 2020

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 23, 2020
@openshift-merge-robot openshift-merge-robot merged commit 51fa8de into containers:master Oct 23, 2020
@matejvasek matejvasek mentioned this pull request Oct 27, 2020
Closed
@matejvasek matejvasek mentioned this pull request Dec 4, 2020
Closed
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 24, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@TomSweeneyRedHat TomSweeneyRedHat TomSweeneyRedHat left review comments

Assignees

@rhatdan rhatdan

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@matejvasek @mheon @rhatdan @jwhonce @openshift-ci-robot @TomSweeneyRedHat @openshift-merge-robot