Skip to content

Conversation

juanvallejo
Copy link
Contributor

Fixes #16064
Addresses BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1487245

$ oc get ... assumed all resources returned from a resource builder were unstructured objects.
This patch ensures we are dealing with unstructured objects before attempting to
compose into an unstructured list.

cc @openshift/cli-review @enj

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Aug 31, 2017
@juanvallejo juanvallejo changed the title UPSTREAM: 0000: ensure all unstructured resources UPSTREAM: 0000: ensure oc get deals with unstructured resources Aug 31, 2017
@juanvallejo
Copy link
Contributor Author

/test extended_conformance_gce

Ensure we are dealing with unstructured objects before attempting to
compose into an unstructured list.
@juanvallejo juanvallejo force-pushed the jvallejo/ensure-unstructured-objects-before-composing branch from dc80f83 to 6974922 Compare August 31, 2017 18:20
@juanvallejo juanvallejo changed the title UPSTREAM: 0000: ensure oc get deals with unstructured resources UPSTREAM: 51727: ensure oc get deals with unstructured resources Aug 31, 2017
@fabianofranz
Copy link
Member

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 8, 2017
@juanvallejo
Copy link
Contributor Author

cc @deads2k or @eparis wondering if you could approve this as well?

@deads2k
Copy link
Contributor

deads2k commented Sep 8, 2017

/approve

@openshift-merge-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, fabianofranz, juanvallejo

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

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 8, 2017
@enj
Copy link
Contributor

enj commented Sep 8, 2017

@juanvallejo add a test (can be a separate PR) that does oc get projectrequests -o yaml to make sure this does not regress.

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue

@openshift-merge-robot openshift-merge-robot merged commit 4c6b2eb into openshift:master Sep 9, 2017
@juanvallejo juanvallejo deleted the jvallejo/ensure-unstructured-objects-before-composing branch September 11, 2017 15:07
openshift-merge-robot added a commit that referenced this pull request Sep 12, 2017
Automatic merge from submit-queue (batch tested with PRs 15927, 16283, 16239, 16271, 16287)

ensure `oc get` handles mixed resource types

Adds a test to ensure `oc get` does not panic when given a list
of both structured and unstructured resources.

Tests changes added in #16082

cc @enj @openshift/cli-review
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants