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

Fix regression for expansion of subcollection on a resource #261

Merged
merged 1 commit into from
Jan 5, 2018

Conversation

jntullo
Copy link

@jntullo jntullo commented Jan 5, 2018

This fixes a regression where subcollections are not being returned for a resource even when it is configured to be returned within the api.yml via the :show option. Two tests were added to ensure the regression does not return.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1529299

@miq-bot add_label blocker, bug

@jntullo
Copy link
Author

jntullo commented Jan 5, 2018

@miq-bot add_label gaprindashvili/yes

Copy link
Contributor

@imtayadeway imtayadeway left a comment

Choose a reason for hiding this comment

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

LGTM. Do you know what revision caused the regression?

@abellotti
Copy link
Member

I think it's 4467c954

@jntullo
Copy link
Author

jntullo commented Jan 5, 2018

@abellotti yeah, that's it. There were no relevant tests so I guess it was missed

@abellotti
Copy link
Member

LGTM!! minor change needed in tests & rebase for the travis failure. Thanks @jntullo for fixing this 👍

…or a resource even when it is configured to be returned within the api.yml.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1529299
@miq-bot
Copy link
Member

miq-bot commented Jan 5, 2018

Checked commit jntullo@742c182 with ruby 2.3.3, rubocop 0.47.1, haml-lint 0.20.0, and yamllint 1.10.0
2 files checked, 0 offenses detected
Everything looks fine. 👍

@abellotti abellotti added this to the Sprint 77 Ending Jan 15, 2018 milestone Jan 5, 2018
@abellotti abellotti merged commit 15206e1 into ManageIQ:master Jan 5, 2018
simaishi pushed a commit that referenced this pull request Jan 5, 2018
Fix regression for expansion of subcollection on a resource
(cherry picked from commit 15206e1)

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1531706
@simaishi
Copy link
Contributor

simaishi commented Jan 5, 2018

Gaprindashvili backport details:

$ git log -1
commit b92ba082623d82092cce57f7ebcb37e06472921e
Author: Alberto Bellotti <abellotti@users.noreply.github.com>
Date:   Fri Jan 5 13:21:23 2018 -0500

    Merge pull request #261 from jntullo/bz_1529299
    
    Fix regression for expansion of subcollection on a resource
    (cherry picked from commit 15206e1ebc5bd58d31c379267daced7826ec5dc1)
    
    Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1531706

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants